Original change: https://android-review.googlesource.com/c/device/sample/+/2101192



Change-Id: I864157b9adb65a577ee9484d6191cba8cb9876a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ccf28780

Change-Id: I500340227444e42cc3cbf5ccc2b7af3766e7794a

Original change: https://android-review.googlesource.com/c/device/sample/+/2100024



Change-Id: Idfb85f9c5492532bbe17477e739647d916171fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Revert "Update sdk parent"

Revert "Slim down the sdk product"

Revert submission 2096601-sdkprod

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/build-details/8608272/targets/sdk, bug b/233036676
Reverted Changes:
I5ef671781:Update sdk parent
I940655c39:Slim down the sdk product
I926d520ce:Update sdk parent

Change-Id: I7bc644e81a1a4dbd69ea95f802989df06cdd8e08

Original change: https://android-review.googlesource.com/c/device/sample/+/2096343



Change-Id: I3ddf3ed176e90688f3deed42e3b3110802f984a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

sdk.mk used to be a synonym for sdk_phone_armv7, but isn't anymore.
Update sample_addon to inherit directly from sdk_phone_armv7 instead.

Bug: 205008975
Test: presubmit
Change-Id: I926d520cec73ac54f4c9da75d9dcc67f2edc7db1

Original change: https://android-review.googlesource.com/c/device/sample/+/2041584

Change-Id: I8acf50fdecbc251eda27c0ed36c8962238060210

Original change: https://android-review.googlesource.com/c/device/sample/+/2041684

Change-Id: I9cb125c5a71afbd1a30e40d50a79aafa2591548d

Original change: https://android-review.googlesource.com/c/device/sample/+/2041584

Change-Id: I752dde3a466944a70d309d6f9f5ae59e9ec690ac

Original change: https://android-review.googlesource.com/c/device/sample/+/2041684

Change-Id: I726ad32b7ea3f7164fd2972385ebb48066f71b04

There are no attributes called mmsc_proxy or mmsc_proxy_port.
Replace with mmsproxy and mmsport.

Test: Manual
Bug: TBD
Change-Id: I9e95667c9b7ea5f32fab692bbf10ad85777dbc73

This mmsproxy was missed in aosp/2039583

Test: Manual
Bug: 190616902
Bug: 226193687
Change-Id: If13418673bf23b748680af374c3d5cc28e5e38bb

Original change: https://android-review.googlesource.com/c/device/sample/+/2039583

Change-Id: I4cece9838d39736643b2702bcc1d531555dafa25

Original change: https://android-review.googlesource.com/c/device/sample/+/2039583

Change-Id: Iaa4142927a4fde7c8fbfd39a4cbf57cee78d654c

BUG: 190616902
BUG: 226193687
Test: make

Change-Id: I0ca25a20b71b340b8ab2cbfa7c0b3759d321e7a6

Original change: https://android-review.googlesource.com/c/device/sample/+/2026784

Change-Id: Idc14f522c3ba4489e42e558694d82c32f92f49ae

Original change: https://android-review.googlesource.com/c/device/sample/+/2026784

Change-Id: I3bdc6b741203eb1e091cea471a43f9027c5cb7fc

The add_missing_ia.py script that added ia type to default APN
types did not take into account that there could be APNs with
apn attribute "default".

The python script is updated.

Co-authored-by: Håkan Kvist <hakan.kvist@sony.com>
Test: Manual
Bug: 224702597
Change-Id: I4ad076ecafd2f9e57e931a7bb099d50d5cf2629e

Original change: https://android-review.googlesource.com/c/device/sample/+/2016818

Change-Id: Ie5f5516ab42f3ecbe1a217dfcf3125248c204e27

Original change: https://android-review.googlesource.com/c/device/sample/+/2016818

Change-Id: I7a31188a2b1d69cc87e5dc8e16a9ff974d754304

Adding APN configuration info for new Operator TANGO(carrier_id:2531).

TANGO-US(carrier_id:10030) - mcc313.mnc770
TANGO-UK(carrier_id:10031) - mcc234.mnc53

Test: Manual
Bug: 210911547
Signed-off-by: Robert Barretto <robertbarretto@tango-networks.com>
Change-Id: Ib171ee97f0fe0212414a1875e29b58440e86ffba

Merge "Add Carrier 2535 (OptiTel) apns to sample apns Bug: 223650488 Test: No change to behavior as this is only a sample file" am: 5946461d am: e6fd9061

Original change: https://android-review.googlesource.com/c/device/sample/+/2019222

Change-Id: I90b751998226564a34eb40ba4bcbb3c18eccac7b

Merge "Add Carrier 2535 (OptiTel) apns to sample apns Bug: 223650488 Test: No change to behavior as this is only a sample file" am: 5946461d

Original change: https://android-review.googlesource.com/c/device/sample/+/2019222

Change-Id: Ic161ba44ff58a0e03c8cf1152a5d9a92fadad8a7

Merge "Add Carrier 2535 (OptiTel) apns to sample apns Bug: 223650488 Test: No change to behavior as this is only a sample file"

Bug: 223650488
Test: No change to behavior as this is only a sample file

Signed-off-by: David Kneipp <davidkneipp@optitel.com.au>
Change-Id: I363f21c408d40d023b265711cce3c0a47ce572c7

Original change: https://android-review.googlesource.com/c/device/sample/+/2007275

Change-Id: I9f6a6a37543aad688cbb10d863dd2de7b8589a9e

Original change: https://android-review.googlesource.com/c/device/sample/+/2007275

Change-Id: I9868357741594d041c8fe0b3ebd767171dfb797b

APNs should be in order for readability and updatability.

Test: Manual
Bug: 221060066
Change-Id: I5be57f11eb10031e1e2b6581c6e08871b505aa67

Original change: https://android-review.googlesource.com/c/device/sample/+/1997430

Change-Id: If9daffea186d279d7e82a9d7c1d5c2d11b2c5fa3

Original change: https://android-review.googlesource.com/c/device/sample/+/1997430

Change-Id: Ia854b60581e63b2eecd6eec265683736fb500ef6