aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-21Rename references to getLteOnCdmaMode am: 2a84c7a9feandroid10-sidebranchAutomerger Merge Worker
Change-Id: I6d99302c4021b16a4d47341b1b81fcc2e4cdd9a5
2020-02-20Rename references to getLteOnCdmaModeSarah Chin
Use @SystemApi TelephonyManager#isGlobalModeEnabled() Test: build Bug: 147335742 Change-Id: I10f47ac1276cbb73ab7eb8c63f5c14b99b99dc41 Merged-In: I10f47ac1276cbb73ab7eb8c63f5c14b99b99dc41
2020-02-14Merge "[Settings] Add permission for #getCdmaRoamingMode" am: fd57001caaZoey Chen
Change-Id: If346ffaf695ab737760cd63a99ef02e72ec50e5a
2020-02-14Merge "[Settings] Add permission for #getCdmaRoamingMode"Zoey Chen
2020-02-05Merge "Update setVpnPackageAuthorization call with VPN type" am: 95e5feb9cfAutomerger Merge Worker
Change-Id: I393f28f36b8a134538288f86aa5f8fbb43f54235
2020-02-04Merge "Update setVpnPackageAuthorization call with VPN type"android-r-preview-1Benedict Wong
2020-02-04Update setVpnPackageAuthorization call with VPN typeBenedict Wong
This commit updates the Settings to also pass the additional VPN type for app-based VPNs. Bug: 144246835 Test: Compiles Change-Id: I6e82d0016d550ba2c38cd31189c74bff1af4ccfa Merged-In: I6e82d0016d550ba2c38cd31189c74bff1af4ccfa
2020-02-01[automerger skipped] Import translations. DO NOT MERGE am: 9834aaac8c -s oursAutomerger Merge Worker
am skip reason: subject contains skip directive Change-Id: I5eca31af357e26f551016a7605ad54c17b370409
2020-02-01Import translations. DO NOT MERGEBill Yi
Change-Id: Id51ce5c2c062428e0a74c770a6d32f0310c49eae Auto-generated-cl: translation import
2020-01-31Merge "Tidy up libcore.timezone APIs" am: 3424f9a963Automerger Merge Worker
Change-Id: I6844695368044a86626496bcc2ff30acfdc6ce3b
2020-01-31Merge "access system resources with android.R package" am: 9f1891018bAutomerger Merge Worker
Change-Id: Iee23821615dd7d4b368d5af4e7c58b7a8c0ed6b7
2020-01-30Merge "Tidy up libcore.timezone APIs"Neil Fuller
2020-01-29Merge "access system resources with android.R package"Sooraj Sasindran
2020-01-29Merge "Update CellIdentityGsm Constructor"Sarah Chin
am: 1f5eede1c0 Change-Id: I652064622a144d587dc951f017dc856d202e65b9
2020-01-29Merge "Update CellIdentityGsm Constructor"Sarah Chin
2020-01-29Drop useless check for PRODUCT_BOOT_JARS redefinition.Ulya Trafimovich
am: 0a0a7847be Change-Id: I8eb5b8f0032db39cd2a654966ad44a14a258ae3f
2020-01-29Drop useless check for PRODUCT_BOOT_JARS redefinition.Ulya Trafimovich
It is not clear why this check exists; it seems to be unneeded, and removing it does not break any tests. PRODUCT_BOOT_JARS is a product variable, and therefore handled in a special way (unlike ordinary Make variables). It is substituted with a macro that inherits makefile-specific instances of this variable and merges them into one. This can be seen by adding debug output to the device-specific makefile. For example, add the following to device/generic/car/aosp_car_arm.mk: $(warning $(PRODUCT_BOOT_JARS)) The build will generate a warning similar to this: device/generic/car/aosp_car_arm.mk:21: warning: @inherit:build/make/target/product/aosp_arm.mk @inherit:device/generic/car/emulator/aosp_car_emulator.mk Test: lunch aosp_car_arm && m Change-Id: Ib5e09c6624dbd4db29105c67543a53caa490b818 Merged-In: I061b70b751ca00efa8f215dba8419d2b9e920403
2020-01-28Tidy up libcore.timezone APIsNeil Fuller
Tidy up the libcore.timezone APIs to make them as close as possible to android.timezone. In future, these classes should be repackages to be the actual android.timezone classes, so the APIs need to be in sync. Bug: 148086409 Test: treehugger Change-Id: Ic312dd70094134229b276549f055e8341af54122
2020-01-27access system resources with android.R packageSooraj Sasindran
access system resources with android.R package Bug: 143289541 Test: make Merged-In: I2ccb04c0e6c77ddeafd8629adeddea5f803bca7b Change-Id: I2ccb04c0e6c77ddeafd8629adeddea5f803bca7b
2020-01-26Update CellIdentityGsm ConstructorNathan Harold
Update the constructor for CellIdentityGsm to add an "additionalPlmns" paramter to the tests. Bug: 135921133 Test: make checkbuild Change-Id: I573b0d3b602c940ee58df4ad487492a68010ccb9 Merged-In: I573b0d3b602c940ee58df4ad487492a68010ccb9
2020-01-23Merge "Switch developeroptions to use Time[|Zone]Detector"Neil Fuller
am: 639075e58c Change-Id: Id5c407961b4fc965f7763ba32cf6e92e42ac8137
2020-01-23Merge "Switch developeroptions to use Time[|Zone]Detector"Neil Fuller
2020-01-17Merge "Merge "Move the app to /system_ext" am: 1f7f219467" into ↵Android Build Merger (Role)
stage-aosp-master
2020-01-17Merge "Move the app to /system_ext"Jeongik Cha
am: 1f7f219467 Change-Id: I0a5d73e87f6204518e5b073b07802f029c74f4a4
2020-01-17Merge "Move the app to /system_ext" am: 1f7f219467Automerger Merge Worker
Change-Id: Ied912f25faa59be2034938f394017b8816eab8be
2020-01-17Merge "Move the app to /system_ext"Treehugger Robot
2020-01-16Move the app to /system_extJeongik Cha
To unbundle product partition, we plan to forbid hidden API in product partition. So this app should be moved to /system_ext because it uses hidden API. It is not permanent, so they can be moved back to /product due to needs if there isn't hidden usage anymore. Bug: 137908189 Test: m Test: check whether device boots successfully Exempt-From-Owner-Approval: cherry-pick from internal Change-Id: I9c4fc342a180aa938cde839cff967f58cfc38df3 Merged-In: I9c4fc342a180aa938cde839cff967f58cfc38df3
2020-01-15DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Xin Li
stage-aosp-master Bug: 146167222 Change-Id: Iaa8cafaafdef638d70b384bd4150c0b88ad622b0
2020-01-15[Settings] Add permission for #getCdmaRoamingModezoey chen
Bug: 145788881 Test: make Change-Id: I396ccb58e0de5c77578fa9055efd509f6549ee33 Merged-In: I396ccb58e0de5c77578fa9055efd509f6549ee33
2020-01-11Merge "Return non-null default values when RemoteException is thrown." into ↵Automerger Merge Worker
qt-qpr1-dev am: 002e6f8ac4 Change-Id: Icec15730acb830a31e72b52ee6f5a6d43b10216b
2020-01-11Merge "Return non-null default values when RemoteException is thrown." into ↵TreeHugger Robot
qt-qpr1-dev
2020-01-11Return non-null default values when RemoteException is thrown.Mark Tabry
Updates return values of getSubscriptions, getAvailableLayers, and getPublisherInfo. Bug: 147520300 Test: atest AndroidCarApiTest CarServiceTest CarServiceUnitTest Change-Id: Id308a870bf66bf2314241a8d2acdb6b8da052bf0 Merged-In: Id308a870bf66bf2314241a8d2acdb6b8da052bf0
2020-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE" into ↵Automerger Merge Worker
qt-qpr1-dev am: 12ae0b5cdb -s ours am skip reason: subject contains skip directive Change-Id: I5fd01bf381c5d706828d08e8d00920887510db34
2020-01-11Merge "Import translations. DO NOT MERGE" into qt-qpr1-devTreeHugger Robot
2020-01-11[Garage Mode] Back-port null checks from master am: 3d2c759d7cAutomerger Merge Worker
Change-Id: Idc3473fcf1cd82c610d09e34bc9d5f3b8d4ed4a3
2020-01-10Import translations. DO NOT MERGEBill Yi
Change-Id: I3b1f32e1e2f8241a3eb56371770e53428a9d45b0 Auto-generated-cl: translation import
2020-01-10[Garage Mode] Back-port null checks from masterJim Kaye
Add null checks when counting how many idle-mode jobs are running. Bug: 146671528 Test: On Hawk Merged-In: If2e22599c62deffa364043f4e6d4ce86fd69b8a2 Change-Id: If2e22599c62deffa364043f4e6d4ce86fd69b8a2
2020-01-10[automerger skipped] Merge "5G meteredness for telephony framework" am: ↵Automerger Merge Worker
f5c11e530f am: 7c2f97e4d3 -s ours am skip reason: Change-Id Ib1c9c9cb0a76429258f6095f5ea2cb4bf6bd911a with SHA-1 76d98ca2d1 is in history Change-Id: Iea9e2ad97beda4a3e1b3927f341657967556a332
2020-01-10Merge "5G meteredness for telephony framework"Sarah Chin
am: f5c11e530f Change-Id: I3e51b2b19605d1e89f47136239ca1d08800bf11f
2020-01-10Merge "5G meteredness for telephony framework"Sarah Chin
2020-01-10Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aospSarah Chin
2020-01-10Whitelist user call activity am: 5e76edff08Automerger Merge Worker
Change-Id: Iec23dc088221f0498ed85328f8c729861a1fab4b
2020-01-105G meteredness for telephony frameworkSarah Chin
Bug: 139070884 Test: atest FrameworksTelephonyTests Change-Id: Ib1c9c9cb0a76429258f6095f5ea2cb4bf6bd911a Merged-In: Ib1c9c9cb0a76429258f6095f5ea2cb4bf6bd911a (cherry picked from commit 7110d32b9fdc2e48206553bf9f38a29112f08adb)
2020-01-09Whitelist user call activityJordan Jozwiak
Assistant sends an intent that is handled by this activity. Dialer then handles the UI. Bug: 146680943 Test: On a Hawk Say "Call <some name>" $ adb shell dumpsys activity service com.android.car | grep "Blocked activity log" -A 5 verify that the UserCallActivity was not blocked Change-Id: Ib584c51604179de80832c60e11e43313a56b3005
2020-01-09[automerger skipped] Merge "Handle 5G meteredness in telephony framework" ↵Automerger Merge Worker
am: b50cb883b5 am: 20a1e9943d -s ours am skip reason: Change-Id I5c3514bc8ea61d1bbbf1d1bf7e466a319046fb97 with SHA-1 3ab296d073 is in history Change-Id: Ie6e1619d7784c62bd7956fa7d11559416b10685c
2020-01-08Merge "Handle 5G meteredness in telephony framework"Sarah Chin
am: b50cb883b5 Change-Id: Ife1319a107c28d04ae8aa01b3582a6f14a955fa1
2020-01-09Merge "Handle 5G meteredness in telephony framework"Sarah Chin
2020-01-09Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aospSarah Chin
2020-01-08Fix Connectivity tab crash. DO NOT MERGE am: df1e6d181cAutomerger Merge Worker
Change-Id: I38c842f4467493dfd4774798b3a365a72ab929c1
2020-01-08Fix Connectivity tab crash. DO NOT MERGETomasz Wasilczyk
Bug: 146429327 Test: open KS and select Connectivity tab Change-Id: I53a0a78e9b5996dc8d42345543f0e8334252847e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 15:13:57 +0000