Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
469,817 Commits 3 Branches 0 Tags
d18119549d8f586e95fa894da86f586e245ebef5
Commit Graph

469817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d18119549d Merge "RebootEscrowManager: always report success metric" into rvc-dev am: cbe538e549 
Change-Id: I5d305c264bd91d8b73fe99e9ab8290bd58578e0a
 2020-03-04 01:14:00 +00:00
Automerger Merge Worker
2594622b69 Merge changes I1169beb3,If7c7b737 into rvc-dev am: 0fd43f11e8 
Change-Id: I4c24f5095ae4c0440dcfb15f7baffa0cc723ab76
 2020-03-04 01:13:42 +00:00
TreeHugger Robot
cbe538e549 Merge "RebootEscrowManager: always report success metric" into rvc-dev 2020-03-04 01:10:04 +00:00
Kevin Han
0fd43f11e8 Merge changes I1169beb3,If7c7b737 into rvc-dev 
* changes:
  Move preparation coordinator to after grouping
  Add listener hook before finalize filter.
 2020-03-04 01:08:32 +00:00
Automerger Merge Worker
bed76741ef Merge "MediaMuxer:Include info to specify last sample duration" into rvc-dev am: 11b93f6f14 
Change-Id: I12b7a2ff8d71e670c41b7f218743462f7c45fd59
 2020-03-04 01:06:04 +00:00
Automerger Merge Worker
0e60de65d4 Merge "Add PowerWhitelistManager.getWhitelistedAppIds." into rvc-dev am: 9d95b2bf8e 
Change-Id: I4e9ecc86c0de58b0aaabde8f71b572f6dd7205b8
 2020-03-04 01:05:30 +00:00
Automerger Merge Worker
d4da411e56 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5455d15913 -s ours 
am skip reason: subject contains skip directive

Change-Id: I41886f41af33b9d4e57667733762d389eeae2a6a
 2020-03-04 01:05:05 +00:00
Automerger Merge Worker
10dac4f98b Merge "Fix augmented autofill to not send multiple request on the same field" into rvc-dev am: 1001711551 
Change-Id: I1973ed460728f64d879fa5a9e39c93c36ef65b58
 2020-03-04 01:04:45 +00:00
Automerger Merge Worker
cad8c2e5c0 Merge "Put ApkVerityTest in vts-core" into rvc-dev am: 37aa47398d 
Change-Id: I38d4633f8c1a214c7a202af2e8a0f4f064b18f44
 2020-03-04 01:03:32 +00:00
Gopalakrishnan Nallasamy
11b93f6f14 Merge "MediaMuxer:Include info to specify last sample duration" into rvc-dev 2020-03-04 01:03:08 +00:00
Automerger Merge Worker
7d53b40f88 Merge "Fix cross profile attribute parsing" into rvc-dev am: 2b1fa477ff 
Change-Id: I0745b5d79475b8ae0a8c0efa8b5d262dd437745f
 2020-03-04 01:02:44 +00:00
Automerger Merge Worker
49b1373b8e Merge "DO NOT MERGE: pinner: Toggle camera pinning on by default" into rvc-dev am: 226dfe4d57 
Change-Id: I1d8896a1d301fada20fcf1fea635ca06e43056db
 2020-03-04 01:01:38 +00:00
Automerger Merge Worker
1e98f094e4 DO NOT MERGE: pinner: Toggle camera pinning on by default am: af9990bf70 
Change-Id: I55e6031ec4ebbbeeeda4d7244ca850ff451cc1df
 2020-03-04 01:01:35 +00:00
Kweku Adams
9d95b2bf8e Merge "Add PowerWhitelistManager.getWhitelistedAppIds." into rvc-dev 2020-03-04 00:55:23 +00:00
TreeHugger Robot
5455d15913 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-04 00:52:29 +00:00
Feng Cao
1001711551 Merge "Fix augmented autofill to not send multiple request on the same field" into rvc-dev 2020-03-04 00:50:39 +00:00
Victor Hsieh
37aa47398d Merge "Put ApkVerityTest in vts-core" into rvc-dev 2020-03-04 00:50:37 +00:00
Winson Chiu
2b1fa477ff Merge "Fix cross profile attribute parsing" into rvc-dev 2020-03-04 00:48:53 +00:00
TreeHugger Robot
226dfe4d57 Merge "DO NOT MERGE: pinner: Toggle camera pinning on by default" into rvc-dev 2020-03-04 00:44:29 +00:00
Automerger Merge Worker
d80227cae6 Merge "dataloader/incfs openWrite returns int" into rvc-dev am: 1f9875dc17 
Change-Id: Ibfe2e079ee357a125ad09f976aeab0130e7bd261
 2020-03-04 00:39:12 +00:00
TreeHugger Robot
1f9875dc17 Merge "dataloader/incfs openWrite returns int" into rvc-dev 2020-03-04 00:24:11 +00:00
Automerger Merge Worker
f4cae7afa3 Merge "Fix ControlsProviderLifecycleManagerTest" into rvc-dev am: 20dd6a2631 
Change-Id: I4a4a507e5578383006eed855c5d38feb9a0ef272
 2020-03-04 00:19:39 +00:00
Ilya Matyukhin
20dd6a2631 Merge "Fix ControlsProviderLifecycleManagerTest" into rvc-dev 2020-03-03 23:59:16 +00:00
Fabian Kozynski
1b968ed8a9 Fix ControlsProviderLifecycleManagerTest 
Flushes executor in each test to get through the correct flow.

Fixes: 150719701
Test: atest ControlsProviderLifecycleManagerTest
Change-Id: I0e76fbbad05038ab1055088ad53c81c9cb7bbddc
 2020-03-03 18:50:45 -05:00
Automerger Merge Worker
0980552cff Merge "Add PlatformCompat permissions to TelephonyProvider" into rvc-dev am: 81866d4149 
Change-Id: Icc8a32703c5c6029239782ef9df475c2c0bc123f
 2020-03-03 23:32:35 +00:00
Hall Liu
81866d4149 Merge "Add PlatformCompat permissions to TelephonyProvider" into rvc-dev 2020-03-03 23:29:19 +00:00
Automerger Merge Worker
29c95f6e52 Merge "Reevaluate constraints on run command." into rvc-dev am: c3e1b7ddff 
Change-Id: Icc494722c9403ee8a88549b92561a5df79868b0c
 2020-03-03 23:22:21 +00:00
Automerger Merge Worker
8d9e31cb83 Merge "Add toast message when bluetooth connects to voice recognition." into rvc-dev am: 4a36106756 
Change-Id: I19066be4ac46fc54693a574aa7132982e731794b
 2020-03-03 23:07:26 +00:00
TreeHugger Robot
c3e1b7ddff Merge "Reevaluate constraints on run command." into rvc-dev 2020-03-03 23:01:19 +00:00
Babak Bostan
4a36106756 Merge "Add toast message when bluetooth connects to voice recognition." into rvc-dev 2020-03-03 22:54:50 +00:00
Automerger Merge Worker
74a01cb7e6 Merge "configure the new key KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT to 4000ms for the UE to defer Wifi OFF until IMS is deregistered (b/142750916)" into rvc-dev am: 4431668e6b 
Change-Id: I4ffad170d62867070df7685b0090ade5607da1c8
 2020-03-03 22:54:26 +00:00
Automerger Merge Worker
db6dad425c [automerger skipped] Merge "Remove Dependency.staticOnConfigurationChanged" into qt-qpr1-dev am: 97af8f1a55 -s ours am: b7d174fb59 -s ours 
am skip reason: Change-Id Id2c3fe5ae2729b181769fb31b8050da264299d72 with SHA-1 bba732de8a is in history

Change-Id: Iff729ab91958506d480512f90be3654a558f8490
 2020-03-03 22:54:18 +00:00
Automerger Merge Worker
d3dd9562f0 Merge "[automerger skipped] Merge "Add EAP methods in wifi.proto" into qt-qpr1-dev am: 2e112273b6 -s ours am skip reason: Change-Id I7f3268b2842783f99c0a43d8b4996d0a7dd46c6e with SHA-1 5cb2b67aba is in history" into rvc-dev am: cb58ccf968 -s ours 
am skip reason: Change-Id I7f3268b2842783f99c0a43d8b4996d0a7dd46c6e with SHA-1 5cb2b67aba is in history

Change-Id: I2a9d93a211c5b33bdf03d89c8c2677b8666cec5f
 2020-03-03 22:54:11 +00:00
Automerger Merge Worker
544ba6a28f Merge "Fix explicit intent for instant app tests." into rvc-dev am: 4fbfa530d7 
Change-Id: Ied3c56fe3e0b5a77693ab81515896209b00b2661
 2020-03-03 22:53:03 +00:00
Radhika Agrawal
4431668e6b Merge "configure the new key KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT to 4000ms for the UE to defer Wifi OFF until IMS is deregistered (b/142750916)" into rvc-dev 2020-03-03 22:50:36 +00:00
Victor Hsieh
e85baf47c2 Put ApkVerityTest in vts-core 
VTS provides rootable environment for ApkVerityTest to run.
ApkVerityTest needs to write block device to verify the failure case of
fs-verity.

Test: see ApkVerityTests and block_device_writer in `unzip -l
      out/host/linux-x86/vts-core/android-vts-core.zip`
Bug: 150641206
Change-Id: Idc71907a28f68fc873c5cac940aa706e0b79843e
 2020-03-03 14:43:33 -08:00
Automerger Merge Worker
b7d174fb59 [automerger skipped] Merge "Remove Dependency.staticOnConfigurationChanged" into qt-qpr1-dev am: 97af8f1a55 -s ours 
am skip reason: Change-Id Id2c3fe5ae2729b181769fb31b8050da264299d72 with SHA-1 bba732de8a is in history

Change-Id: I2ed510dc27a0029eccbef934aeee768ec8b94a5e
 2020-03-03 22:40:25 +00:00
Automerger Merge Worker
cb58ccf968 Merge "[automerger skipped] Merge "Add EAP methods in wifi.proto" into qt-qpr1-dev am: 2e112273b6 -s ours am skip reason: Change-Id I7f3268b2842783f99c0a43d8b4996d0a7dd46c6e with SHA-1 5cb2b67aba is in history" into rvc-dev 2020-03-03 22:39:47 +00:00
Automerger Merge Worker
cf06f18952 [automerger skipped] Merge "Add EAP methods in wifi.proto" into qt-qpr1-dev am: 2e112273b6 -s ours 
am skip reason: Change-Id I7f3268b2842783f99c0a43d8b4996d0a7dd46c6e with SHA-1 5cb2b67aba is in history

Change-Id: I907470430d243218b6b4585c004930a2c3fbccf8
 2020-03-03 22:39:42 +00:00
Adam He
4fbfa530d7 Merge "Fix explicit intent for instant app tests." into rvc-dev 2020-03-03 22:39:40 +00:00
Automerger Merge Worker
82021cdd39 Merge "Use correspondence to compare interible objects in test" into rvc-dev am: 139544fd63 
Change-Id: I9ea2a554157e4d18279a420b2bc0fd1bbf8c41e5
 2020-03-03 22:34:27 +00:00
Feng Cao
8aee9bc74a Fix augmented autofill to not send multiple request on the same field 
* Don't send multiple request when focused view doesn't change
* The difference is *when to return*. In the old code, we are returning
  only when all four conditions are met, otherwise we will go to the
  next lines requestNewFillResponseOnViewEnteredIfNecessaryLocked()
  which will indeed trigger a new augmented autofill request. In the
  new code, we will return if the three conditions are met, or if the
  other three conditions are met...

Test: manual verification
Test: atest android.autofillservice.cts.inline
Test: atest android.autofillservice.cts.augmented
Bug: 145949573

Change-Id: I9ff3873e3aec8c1366d4aa16c9ef7662cfde45e2
 2020-03-03 14:31:29 -08:00
Dave Mankoff
97af8f1a55 Merge "Remove Dependency.staticOnConfigurationChanged" into qt-qpr1-dev 2020-03-03 22:30:59 +00:00
Amy Zhang
139544fd63 Merge "Use correspondence to compare interible objects in test" into rvc-dev 2020-03-03 22:23:29 +00:00
Automerger Merge Worker
4dfc3da39f Merge "Show a spinner when waiting for the work profile to turn on." into rvc-dev am: f6b536594b 
Change-Id: I542b0ec10f9df918cbdc4cfa2e563cf49a31d95f
 2020-03-03 21:35:33 +00:00
Automerger Merge Worker
bf1438317f Merge "Fix PackageManagerService onlyCore and factoryTest ordering" into rvc-dev am: ff37a26f9a 
Change-Id: Ic3b843aa5ccfdab72d9278f362e91c5ed7b4605e
 2020-03-03 21:34:23 +00:00
Antoan Angelov
f6b536594b Merge "Show a spinner when waiting for the work profile to turn on." into rvc-dev 2020-03-03 21:34:02 +00:00
Kenny Root
1eb8ead904 RebootEscrowManager: always report success metric 
In the process of OTAing from a build that does not have the armed
status marker, all metrics are going to be lost. Since a success is
a sure indication that reboot escrow was prepared before reboot, then
we should mark it as a success always.

On the other side, a failure could be a manual reboot if we did not
have the armed marker.

(cherry picked from commit bdb3cdc497)

Bug: 149833390
Test: atest RebootEscrowManagerTests
Merged-In: Iaa179039eb7f587a6596a70176d42761e09b0fac
Change-Id: Iaa179039eb7f587a6596a70176d42761e09b0fac
 2020-03-03 21:31:55 +00:00
Winson Chiu
ff37a26f9a Merge "Fix PackageManagerService onlyCore and factoryTest ordering" into rvc-dev 2020-03-03 21:27:38 +00:00
Automerger Merge Worker
6741dc39ef Merge "Create source stamp verifier in platform" into rvc-dev am: e2ab8ed00e 
Change-Id: I3deff9b5811cbfeb7b425b363209e95843ee8bff
 2020-03-03 21:24:53 +00:00