Automerger Merge Worker
366b8a2245
Merge "Disable caches for perf tests" into rvc-dev am: 667af98d38
...
Change-Id: I0a151d7e6806c80474008ac078d4cfb20cfb9c83
2020-02-25 15:57:53 +00:00
Patrick Baumann
667af98d38
Merge "Disable caches for perf tests" into rvc-dev
2020-02-25 15:45:32 +00:00
Automerger Merge Worker
f20e0ee6c5
Merge "Squash same ApplicationInfo's in Parcel" into rvc-dev am: 9577cd78ff
...
Change-Id: I4d06b09676409da4353e9e742786648736ca5738
2020-02-25 15:20:18 +00:00
Makoto Onuki
9577cd78ff
Merge "Squash same ApplicationInfo's in Parcel" into rvc-dev
2020-02-25 15:17:14 +00:00
Automerger Merge Worker
b42d60fd69
Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29
...
Change-Id: I9e44db3045766b22f42362cbc4c44a5d9a204345
2020-02-25 15:14:59 +00:00
TreeHugger Robot
aba5f0ca29
Merge "Build framework-tethering against module_current" into rvc-dev
2020-02-25 15:09:16 +00:00
Automerger Merge Worker
87dc3624f1
Merge "Increase avatar and sender name sizes in MessagingStyle" into rvc-dev am: 7b27da1d8f
...
Change-Id: I73d52d04c41477b800168060c483d695d218ff06
2020-02-25 15:08:13 +00:00
Automerger Merge Worker
d4c1501722
Merge "Fix important person notification ranking test" into rvc-dev am: ae97b108aa
...
Change-Id: I565c6f29983ab6333e464af05168ffb7d48a6852
2020-02-25 15:07:21 +00:00
Steve Elliott
7b27da1d8f
Merge "Increase avatar and sender name sizes in MessagingStyle" into rvc-dev
2020-02-25 14:59:13 +00:00
Steve Elliott
ae97b108aa
Merge "Fix important person notification ranking test" into rvc-dev
2020-02-25 14:57:06 +00:00
Automerger Merge Worker
f08ba60985
Merge "Use KeyguardStateController in GlobalActionsDialog" into rvc-dev am: 26e248664d
...
Change-Id: I559423f49ff1bc7a2ce4f31e73886d3df3dc5faa
2020-02-25 14:18:45 +00:00
Fabian Kozynski
26e248664d
Merge "Use KeyguardStateController in GlobalActionsDialog" into rvc-dev
2020-02-25 14:07:51 +00:00
Automerger Merge Worker
ebe4eedfdd
Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev am: 6d81a5f569
...
Change-Id: I0c29f0a436f8fd817f0c5c34d134c081401e1b99
2020-02-25 13:04:41 +00:00
Makoto Onuki
6d81a5f569
Merge "Revert "Add WTF when a system server wrapper can't be found"" into rvc-dev
2020-02-25 12:53:58 +00:00
Zhuoyao Zhang
3495b81006
Revert "Add WTF when a system server wrapper can't be found"
...
This reverts commit 2cddb8a891 .
Reason for revert: break app compat test b/149923038
Bug: 149923038
Change-Id: Ibace06f704595d40a4439c0bdfea55d11294ba77
2020-02-25 12:53:29 +00:00
Automerger Merge Worker
dd66516fe9
Create DreamManager System Server TestApi am: 641e2e6361
...
Change-Id: I84802d802d2419223dd3f54f1d57bf98a7a9c685
2020-02-25 12:41:30 +00:00
Galia Peycheva
641e2e6361
Create DreamManager System Server TestApi
...
Bug: 141771803
Bug: 133216167
Test: atest DreamManagerServiceTests
Test: make checkbuild
Merged-In: I937061138bc8ccaf4475674f00331c3fe1c5a495
Change-Id: I937061138bc8ccaf4475674f00331c3fe1c5a495
(cherry picked from commit 4467c53c11 )
2020-02-25 12:32:02 +00:00
Automerger Merge Worker
9138b8deab
Merge "reduce the visibility of framework-minus-apex" into rvc-dev am: e06e29bb09
...
Change-Id: Ie96980047f6f9f9c1d5d3f0784b6f59b2ed22c84
2020-02-25 11:44:46 +00:00
TreeHugger Robot
e06e29bb09
Merge "reduce the visibility of framework-minus-apex" into rvc-dev
2020-02-25 11:33:44 +00:00
Automerger Merge Worker
183986e0a9
Merge changes Id71b4cbc,I8dff0a12,Ife3d1390 into rvc-dev am: a72d7e53e6
...
Change-Id: I9acb6efd6324b8e7b4ae6bc74fdb6287199ed911
2020-02-25 10:24:53 +00:00
Automerger Merge Worker
d5c8310562
Make DreamService use an Activity am: 6861e91b84
...
Change-Id: Ia244d76ed0fc3eb38860cd0bd6af90e0d4ea7bf6
2020-02-25 10:24:44 +00:00
Automerger Merge Worker
6c2ed35774
Clean up dreamland am: a8e4641296
...
Change-Id: I72a2a845db0d5488ac5532917be429bb5095184e
2020-02-25 10:24:38 +00:00
Galia Peycheva
a72d7e53e6
Merge changes Id71b4cbc,I8dff0a12,Ife3d1390 into rvc-dev
...
* changes:
Add startDreamActivity request verification
Make DreamService use an Activity
Clean up dreamland
2020-02-25 10:11:21 +00:00
Automerger Merge Worker
36d955d28f
Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" into rvc-dev am: 61b8ac42c3
...
Change-Id: I50a56e9b2ba35cff514f0632c2df7dab5c719497
2020-02-25 09:56:18 +00:00
Automerger Merge Worker
561564dfd4
Build framework-tethering against module_current
...
Bug: 146757305
Test: build
Change-Id: Id6051296a02060179666b67fc6ea9092273c1780
Merged-In: Id6051296a02060179666b67fc6ea9092273c1780
Merged-In: Iad504f0e709daadfb4d86205c07f0faf429f5a8f
(cherry picked from commit bb09ceaf09 )
2020-02-25 09:47:25 +00:00
George Chang
61b8ac42c3
Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" into rvc-dev
2020-02-25 09:42:23 +00:00
Automerger Merge Worker
ecc30c0673
Merge "Change checkpointing retry count to 2" into rvc-dev am: fb7bda9734
...
Change-Id: Ibd135e03f03f2b37cd6d5b2ccec5932fc03274a3
2020-02-25 08:05:22 +00:00
Automerger Merge Worker
dc18d9df6d
Merge "Use correct PackageSetting for dexopt calculation" into rvc-dev am: d012f7bee6
...
Change-Id: I0343ec86adb3a6280f7c5494ef8e9f1a899f17d3
2020-02-25 08:04:28 +00:00
Automerger Merge Worker
8bf6bf7572
Merge "Don't crash system_server if fixupAppDir() fails." into rvc-dev am: c8a208f571
...
Change-Id: I265574278def9a60f743227d48d6dd02d9a45b90
2020-02-25 08:03:48 +00:00
Galia Peycheva
52e8922e8a
Add startDreamActivity request verification
...
The ActivityTaskManagerTestService has a special method to start a
DreamActivity. This CL adds a verification check before the activity is
started to check that the caller is the currently active dream
component.
Bug: 133216167
Test: atest DreamManagerServiceTest
Merged-In: Id71b4cbc57c6569f58b6d906cc8361c104a507dc
Change-Id: Id71b4cbc57c6569f58b6d906cc8361c104a507dc
(cherry picked from commit 20dc51820a )
2020-02-25 07:57:09 +00:00
Galia Peycheva
6861e91b84
Make DreamService use an Activity
...
Currently, the DreamService uses a floating Window to display the
content of the dream on the screen. This introduces difficulties in the
interactions with the Assistant application, which is an activity.
By design, if the Assistant is invoked while the device is dreaming, the
Assistant should be shown on top. However, since floating windows are
always drawn on top of all activities, the Assistant can't be shown on
top of the Dream.
Here, we migrate the implementation of the DreamService to use an
Activity (DreamActivity). Since the screensaver application is not part
of the framework, we can't declare the activity in their AndroidManifest.xml.
Therefore, we start the dream activity with a dedicated method in
ActivityTaskManagerService.
Bug: 133216167
Test: 1. m && ./vendor/google/tools/flashall
2. Go to Settings > Device Preferences > Screensaver > Start now
3. Verify dream appears
4. Click any key to wake up the dream
5. Verify that dream disappears
Merged-In: I8dff0a124cd1b41fb925a73528305431b49ee06d
Change-Id: I8dff0a124cd1b41fb925a73528305431b49ee06d
(cherry picked from commit 148478a85e )
2020-02-25 07:56:28 +00:00
Gavin Corkery
fb7bda9734
Merge "Change checkpointing retry count to 2" into rvc-dev
2020-02-25 07:56:01 +00:00
Winson Chiu
d012f7bee6
Merge "Use correct PackageSetting for dexopt calculation" into rvc-dev
2020-02-25 07:55:52 +00:00
Martijn Coenen
c8a208f571
Merge "Don't crash system_server if fixupAppDir() fails." into rvc-dev
2020-02-25 07:53:57 +00:00
Automerger Merge Worker
8d9fa7833d
Merge "Fixed not updating waterfall insets in DisplayCutout.inset()" into rvc-dev am: faff9bd887
...
Change-Id: If7ce784ff9ef545f9fe3183089747e8a6fd08257
2020-02-25 06:19:54 +00:00
Automerger Merge Worker
903113ebc4
Merge "Remove key from adb_keys if user forgets the key." into rvc-dev am: b76d7aa6bc
...
Change-Id: I935b7d725fb38079a77412e14333c900d5025d6f
2020-02-25 06:19:14 +00:00
Shawn Lin
faff9bd887
Merge "Fixed not updating waterfall insets in DisplayCutout.inset()" into rvc-dev
2020-02-25 06:15:37 +00:00
Joshua Duong
b76d7aa6bc
Merge "Remove key from adb_keys if user forgets the key." into rvc-dev
2020-02-25 06:10:49 +00:00
Automerger Merge Worker
ea9af3b3f7
Merge "Introduce SoftInputShowHideHistory" into rvc-dev am: 20ea7f5258
...
Change-Id: I0cb1690564f7b65f58a7c487e4f44a2f5e422767
2020-02-25 05:44:20 +00:00
TreeHugger Robot
20ea7f5258
Merge "Introduce SoftInputShowHideHistory" into rvc-dev
2020-02-25 05:35:25 +00:00
Automerger Merge Worker
5e81308738
Merge changes from topic "trm-impl-rvc" into rvc-dev am: 7ff127e897
...
Change-Id: Ie2e037adf18ab2b57ab650e14dea19b271ee2049
2020-02-25 05:17:58 +00:00
Amy Zhang
7ff127e897
Merge changes from topic "trm-impl-rvc" into rvc-dev
...
* changes:
Fix issues in register/unregister client API implementation
Add a TRM use case priority hints info object
Add requestFrontend implementation in TunerResourceManager
Implement TRM setFrontendInfoList logic with unit tests
2020-02-25 05:02:44 +00:00
Automerger Merge Worker
28d79c4c4c
Merge "Retry TTS speaking for a11y shortcut warning dialog" into rvc-dev am: 67c02e6cb0
...
Change-Id: I3271aba62a790c04366b13fcd682b6fbe6fd7c58
2020-02-25 04:51:37 +00:00
TreeHugger Robot
67c02e6cb0
Merge "Retry TTS speaking for a11y shortcut warning dialog" into rvc-dev
2020-02-25 04:43:08 +00:00
Automerger Merge Worker
fc107deeb0
Merge "Fix exempt vs unexempt scheduled sync standby bucket logic" into rvc-dev am: d44e0e38e3
...
Change-Id: If06a4ede819db39985cb39fef4f895b63135c890
2020-02-25 04:30:33 +00:00
Automerger Merge Worker
a75ac70422
Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev am: 395262cbb4
...
Change-Id: Ie057e52315916f195f1308af8fd4d1fa1338597a
2020-02-25 04:30:14 +00:00
TreeHugger Robot
d44e0e38e3
Merge "Fix exempt vs unexempt scheduled sync standby bucket logic" into rvc-dev
2020-02-25 04:29:32 +00:00
TreeHugger Robot
395262cbb4
Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev
2020-02-25 04:21:02 +00:00
Automerger Merge Worker
741e10f167
Merge "wifi: Revise java doc to add more explanation" into rvc-dev am: 426b08e2f4
...
Change-Id: I403fcef26ee106317c6b8bee99b8df037a9d5777
2020-02-25 04:03:28 +00:00
TreeHugger Robot
426b08e2f4
Merge "wifi: Revise java doc to add more explanation" into rvc-dev
2020-02-25 03:48:14 +00:00