Commit Graph

5815 Commits

Author SHA1 Message Date
Automerger Merge Worker
c487ab0f50 Merge "Update ACTION_BIOMETRIC_ENROLL documentation" into rvc-dev am: 5a563d2870 am: 8b37efeae4 am: 5ce7363820 am: 0f06cd0ca3
Change-Id: I2c59415ebb3316c16bdf8cc9e453c109e61b5079
2020-03-11 21:58:11 +00:00
Soonil Nagarkar
9b0f51e811 Merge "Remove remaining LOCATION_PROVIDERS_ALLOWED usages" 2020-03-11 21:33:00 +00:00
Kevin Chyn
5a563d2870 Merge "Update ACTION_BIOMETRIC_ENROLL documentation" into rvc-dev 2020-03-11 20:56:42 +00:00
Hongyi Zhang
175d1d0443 Merge "RescueParty: Add a DeviceConfig killswitch" 2020-03-11 19:47:33 +00:00
Soonil Nagarkar
6cc3fce90a Remove remaining LOCATION_PROVIDERS_ALLOWED usages
Bug: 148963686
Test: presubmits
Change-Id: I8dbc8d4f20a63398348547dc3a6467367b9fc8d8
2020-03-11 12:11:37 -07:00
Automerger Merge Worker
fb0aee64aa Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa2492 am: 2268e82234 am: dc4d550c88 am: 57fbe8f7ba
Change-Id: Ifc9cd8545b84f6953d68dd4a6179ebf328d2cb0c
2020-03-11 16:35:18 +00:00
Hongyi Zhang
1c0993cf12 RescueParty: Add a DeviceConfig killswitch
1. Add a killswitch DeviceConfig flag in case emergency rollback is
needed (e.g. PackageWatchdog doesn't behave correctly).
2. Register the namespace for native flag sync mapper so that we can
also use the flag to turn off native disaster recovery.

Test: Atest RescueParty & verified on local device
Bug: 149420506
Change-Id: I9a0b546c7229c8444947b522585dd2c5ed37a00b
2020-03-11 16:27:53 +00:00
Ruslan Tkhakokhov
71888e5fa1 Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission
Bug: 150877732
Test: 1. atest SettingsProviderTest
      2. atest PreservedSettingsRestoreHostSideTest (with
      MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE granted to shell)
Change-Id: I5536233b2084a31161185235195e2a6b25b4c3d1
2020-03-11 10:59:31 +00:00
Zoey Chen
86ead28687 Merge "Revert [Telephony mainline] Add SystemApi and NonNull annotation" 2020-03-11 07:55:35 +00:00
Automerger Merge Worker
36aa10dace Merge "Added todo work" into rvc-dev am: fa75bf5bc7 am: df4cfeab07 am: b18b24f4d3 am: 2e8c08e680
Change-Id: I569ac6f48efe8cc8778f10e2762e2e62f413affb
2020-03-11 06:28:43 +00:00
Automerger Merge Worker
4eccd691bf Merge "Undo commit "Expose constants in Telephony.Carriers"" into rvc-dev am: f414c083dd am: 5d93bbacdb am: 76e7c0583d am: 06870a3d84
Change-Id: I148228c13ea3ffbe6b4ac29349eda8f2f63841c2
2020-03-11 06:26:20 +00:00
Jack Yu
fa75bf5bc7 Merge "Added todo work" into rvc-dev 2020-03-11 05:56:18 +00:00
TreeHugger Robot
f414c083dd Merge "Undo commit "Expose constants in Telephony.Carriers"" into rvc-dev 2020-03-11 05:39:55 +00:00
Kevin Chyn
cf7fe46daf Update ACTION_BIOMETRIC_ENROLL documentation
Activity result codes are already being used "undocumentedly" by SUW.
Given the timeline, it's better to not make any guarantees about the
result code and just mention that applications should still check
BiometricManager#canAuthenticate(int) after onActivityResult.

Fixes: 151058692

Test: Skip fingerprint in SUW. Fingerprint SUW is not shown again.
Change-Id: Ia36ea1b6cfc39848be00f8d2219604e68ff45213
2020-03-10 17:23:47 -07:00
Daniel Bright
5dbd3c3b69 Undo commit "Expose constants in Telephony.Carriers"
Undid carrier constants as @SystemApis.  Also had to move
constants out of annotation.java because any references in
that specific file need to be to public APIs.

Bug: 148170690
Test: make, flash
Change-Id: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
2020-03-10 12:27:16 -07:00
Automerger Merge Worker
2372be2c1e Merge "Disable APN lockdown for apps targeting pre-R" into rvc-dev am: b8eacbec89 am: c37dc025ce am: 02ac94c0de am: e8cbe0481d
Change-Id: Id4edaccf365c83de06fe19090b641c680f7aa47e
2020-03-10 02:04:43 +00:00
Hall Liu
b8eacbec89 Merge "Disable APN lockdown for apps targeting pre-R" into rvc-dev 2020-03-10 01:15:25 +00:00
Hall Liu
246e470e89 Merge "Allow empty tokens in strict grammar" 2020-03-10 01:11:06 +00:00
Automerger Merge Worker
a55e09410e Merge "Merge "More CTS for APIs used by Mainline." into rvc-dev am: 469263a457 am: cdac1f3854" into rvc-d1-dev-plus-aosp am: e2a6e48ee5 am: dbcb04010b
Change-Id: Ia481c61683c8234b68ae97b264eefb8bbc479750
2020-03-09 23:21:22 +00:00
Hall Liu
ea5b2c08df Allow empty tokens in strict grammar
Allow empty tokens in SQLiteQueryBuilder's strict grammar enforcement

Bug: 143230980
Test: atest SQLiteQueryBuilderTest, manual
Change-Id: Ie82dded77a3eaa75095333b0e77f10e21c9f7caf
2020-03-09 14:28:35 -07:00
Jeff Sharkey
9ed18340ca More CTS for APIs used by Mainline.
Bug: 150641862, 150641715, 150641138, 150640123
Test: atest cts/tests/tests/content/src/android/content/cts/ContentResolverTest.java
Test: atest cts/tests/tests/os/src/android/os/cts/BinderTest.java
Test: atest cts/tests/tests/provider/src/android/provider/cts/DocumentsContractTest.java
Test: atest cts/tests/tests/provider/src/android/provider/cts/media/MediaStoreTest.java
Change-Id: I6f9ae1dcffd79fd6c422962d9ca64d4b98841766
2020-03-09 20:12:55 +00:00
zoey chen
2d280f1bb4 Revert [Telephony mainline] Add SystemApi and NonNull annotation
Reason: Revisit and redesign in S

Bug: 147390517
Test: make
Change-Id: I0749492a5648dfa2fb83271f349a8370972f7032
2020-03-09 16:18:44 +08:00
Jack Yu
c38a70a946 Added todo work
Added todo work to deprecate the broadcasted flag, which is
essentially replaced by the displayed flag.

Test: None
Bug: 143229383
Change-Id: I3907d0d76166a768e57bfa420855e6a0563968a8
2020-03-08 00:37:37 -08:00
Automerger Merge Worker
e05cebb507 Merge "Rename biometric enroll extra" into rvc-dev am: db45def65e am: a0b5de810e am: c895287848 am: 3ea61e1828
Change-Id: I7b7ed9399caefb7812e5433838c0192a2b41374e
2020-03-07 23:10:16 +00:00
Automerger Merge Worker
7a083b9134 Merge "Add a limit on how much data an app can acquire a lease on." into rvc-dev am: cd629dd39a am: 78a5f4ba32 am: a0085ebfd7 am: f8061e7a7f
Change-Id: I9ffbf1e45e7691660d9b14cb2256317ed95c5728
2020-03-07 23:09:59 +00:00
Kevin Chyn
db45def65e Merge "Rename biometric enroll extra" into rvc-dev 2020-03-06 22:43:57 +00:00
Sudheer Shanka
cd629dd39a Merge "Add a limit on how much data an app can acquire a lease on." into rvc-dev 2020-03-06 22:39:06 +00:00
Automerger Merge Worker
afaf4c65ce Merge "Support long press accessibility button (1/n)" into rvc-dev am: 02b288d66e am: ae6e89b657 am: f4e2e1ad62 am: 287df0f647
Change-Id: I23555df1bc019cb5ace0b55f0bbb84665caf4bb8
2020-03-06 09:57:52 +00:00
Rhed Jao
a4bb7e44da Support long press accessibility button (1/n)
Adds a new setting key to support long press accessibility
button.

Bug: 150587818
Test: atest SettingsProviderTest
Change-Id: I1ca1e01867a937690f7a5e5b27d595cd0a83e395
2020-03-06 06:18:51 +00:00
Kevin Chyn
90cc357df1 Rename biometric enroll extra
Fixes: 150499348

Test: make -j56 update-api
Test: CtsVerifier
Change-Id: Iaa4c682c74c2a082f5e6ec8bd4d1680e1ff8a4bc
2020-03-05 16:53:34 -08:00
Hall Liu
34e61996c5 Disable APN lockdown for apps targeting pre-R
Allow apps targeting pre-R to access the APN db without permissions

Bug: 148552357
Test: manual
Change-Id: I47d142e9984b932f030c29729b9ebcd75c51d26f
2020-03-05 13:52:04 -08:00
Automerger Merge Worker
72c15dd04a Merge "Add new capability polling opt-in intent" into rvc-dev am: cd31f739da am: 6c7a529add am: 45150b77f2 am: 0a1b779d64
Change-Id: Id780867b8a350cdddf032086ab8cb986f433bb17
2020-03-04 19:28:58 +00:00
Brad Ebinger
cd31f739da Merge "Add new capability polling opt-in intent" into rvc-dev 2020-03-04 18:05:24 +00:00
Automerger Merge Worker
ecb08643c3 Merge "Dark theme not working bug" into rvc-dev am: 55318a3474 am: 78f368f6c9 am: 77d5472abf am: 8bc89f3ed0 am: 84be910e66
Change-Id: I80b75019665d697556a23d7cffe24a8f499ce8aa
2020-03-04 16:56:49 +00:00
Brad Ebinger
0a5a8fe7f4 Add new capability polling opt-in intent
Adds a new capability discovery opt-in intent,
which an application can use to prompt the user
to enable contact discovery.

Bug: 111305845
Test: atest CtsTelephonyTestCases; telecom test app
Change-Id: I42b9d7226a1296bc7e4e86a5ff6448bc8f23d3c0
2020-03-03 17:18:32 -08:00
Jay Aliomer
d483f72ee3 Dark theme not working bug
When switching dark mode, the dark mode override should only apply when
the dark theme is in auto or custom mode. The solution is
to set the override to the same value as night mode

Test: UiModeManagerTest

Fixes: 150567159
Change-Id: Ib10b73e747a53669de0babc9b44d373b47bfc0fb
2020-03-03 15:20:12 -05:00
Automerger Merge Worker
4d3fdda3b5 Merge "Settings(javadocs): Add alternatives for deprecated settings" into rvc-dev am: f5360ee034 am: 6279dcd351 am: afc8150391 am: b7a472db2c
Change-Id: Iedc922084c263640b61e4d51de968edfce24318a
2020-02-28 04:17:04 +00:00
Roshan Pius
b3b559f167 Settings(javadocs): Add alternatives for deprecated settings
Bug: 150219394
Test: Compiles
Change-Id: Ie4dfbfa640a042343e20d2238729444fdc8eadb6
2020-02-28 03:35:12 +00:00
Soonil Nagarkar
e9af9a8b92 Merge "Refactor appops across location" 2020-02-24 22:52:51 +00:00
Sudheer Shanka
364364ba41 Add a limit on how much data an app can acquire a lease on.
+ Allow this limit to be modified using DeviceConfig properties.
+ Support DeviceConfig.getProperties() in TestableDeviceConfig.

Bug: 144155182
Test: atest --test-mapping apex/blobstore
Test: atest services/tests/mockingservicestests/src/com/android/server/testables/TestableDeviceConfigTest.java
Test: atest services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
Change-Id: I28e67a27771be04ed1d37f367abd392505adc5c4
2020-02-24 05:52:33 +00:00
Blake Kragten
75a0184bb7 Merge "Enhanced Connectivity Dev Toggle" 2020-02-21 22:14:23 +00:00
Soonil Nagarkar
6033344baa Refactor appops across location
-Add a new app ops helper to make testing easier.
-Consolidate app identity within CallerIdentity class.
-Remove location age restriction for coarse locations, was a bit
arbitrary.
-Remove listener identifiers from LM. These were not being properly
propagated and add a lot of binder overhead with what appears to be
little benefit since we have featureIds, which contain much better
information.
-Remove appops checks from some GNSS APIs that shouldn't require it.
-Move location fudger into location providers and reset them after mock
providers are used so that offset information cannot be leaked.

Test: presubmits + manual
Change-Id: I0ab6318093b1a7c7210ce9e39ccccf75d4f2eb66
2020-02-21 10:09:02 -08:00
Joshua Duong
2076c04333 Add Settings.Global.ADB_WIFI_ENABLED.
ADB_ENABLED historically meant the state for USB debugging. Since
wireless debugging can be enabled separately, define another setting
for it.

BUG: b/111434128

Test: make
Exempt-From-Owner-Approval: approved in aosp_master
Change-Id: If3abca8e77381d6832f55d55a43c52ee1a1267d1
2020-02-21 02:21:08 +00:00
Varun Shah
abe60fe376 Merge "Share Standby Bucket state between cross profile interacting apps" 2020-02-20 00:50:52 +00:00
Michael Wachenschwanz
9a3501d6bb Share Standby Bucket state between cross profile interacting apps
Cross profile connected apps can provide the functionality of multiple
app from just one of the apps. If the user uses only one of the apps to
interact with all of the connected apps, the connected apps will fall
into low standby buckets. Cross profile connecting apps and using the
conncted apps is the clear signal of usage for both apps, so this
change treats all usage of one app to be equal to the other.

Fixes: 140808123
Test: atest com.android.server.usage.AppStandbyControllerTests
Change-Id: I9e3bd71c7b486417b3943778edece4ab29d4c41d
2020-02-19 14:48:43 -08:00
Bohdan Petrivskyy
7f1264e629 Merge "Removes redundant @SystemApi for registerMonitorCallback and from MONITOR_DEVICE_CONFIG_ACCESS permission declaration." 2020-02-19 22:07:00 +00:00
Nate Myren
8f842ae786 Merge "Add Auto Revoke Enabled settings constant" 2020-02-19 21:18:36 +00:00
Roshan Pius
bd8dd47fde Merge changes from topics "ap_shutdown_timeout_flag", "scan_always_available_API"
* changes:
  WifiOemMigrationHook: Migrate Settings global values
  WifiManager: Add API for scan always available toggle
  SoftApConfiguration: Add shutdown enabled method
2020-02-19 16:28:43 +00:00
Julia Reynolds
042ebb1dc8 Merge changes from topics "jr-all-convo", "jr-default-vic"
* changes:
  Optionally make VICs bubble
  Add method to retrieve all conversations
2020-02-19 12:24:56 +00:00
Hugh Chen
f786c7fa6c Merge "Add Settings.Global.ADVANCED_BATTERY_USAGE_AMOUNT" 2020-02-19 10:20:28 +00:00