Remi NGUYEN VAN
df6464d890
Merge "Fix testRegisterUsageCallback" am: d0b9f983d6 am: 66674ce8fb
...
am: 6b8e9a0635
Change-Id: I2a64dcaa10cd4f26e6508be9bad1d4ecc1dc3d12
2018-05-08 02:24:48 -07:00
Remi NGUYEN VAN
6b8e9a0635
Merge "Fix testRegisterUsageCallback" am: d0b9f983d6
...
am: 66674ce8fb
Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1
2018-05-08 02:13:00 -07:00
Remi NGUYEN VAN
66674ce8fb
Merge "Fix testRegisterUsageCallback"
...
am: d0b9f983d6
Change-Id: I7ec1e3a05971e8e0448289e3c3f979fd7dcfe144
2018-05-08 02:00:59 -07:00
Remi NGUYEN VAN
d0b9f983d6
Merge "Fix testRegisterUsageCallback"
2018-05-08 07:55:42 +00:00
android-build-team Robot
13ca02c1e2
Merge "AOD padding animation should match slice" into pi-dev am: 1b5e2d8b3e
...
am: 299eba7cef
Change-Id: Id8b78ff37f5c6b6b0edd3ef6b7f6e90a84901b6c
2018-05-07 23:13:15 -07:00
android-build-team Robot
299eba7cef
Merge "AOD padding animation should match slice" into pi-dev
...
am: 1b5e2d8b3e
Change-Id: I9795fc0a2e780c6b8075ea5f4c5a4d514b1a61b0
2018-05-07 23:03:51 -07:00
android-build-team Robot
1b5e2d8b3e
Merge "AOD padding animation should match slice" into pi-dev
2018-05-08 05:52:36 +00:00
Remi NGUYEN VAN
ada973be57
Merge "Fix testUidPoliciesToString" am: c8613f9965 am: 717f4e19d8
...
am: 44e953f177
Change-Id: I9f94bcc30714ea50bbb3825f51b9a48cacaab4f4
2018-05-07 22:47:55 -07:00
Remi NGUYEN VAN
44e953f177
Merge "Fix testUidPoliciesToString" am: c8613f9965
...
am: 717f4e19d8
Change-Id: Ic61bf635c929f3e3e14bb913eba238cd53e955a6
2018-05-07 22:32:14 -07:00
Remi NGUYEN VAN
717f4e19d8
Merge "Fix testUidPoliciesToString"
...
am: c8613f9965
Change-Id: I3ec2fd01ca55ef63d0bfe0cec48854f852c736cc
2018-05-07 22:24:56 -07:00
Wei Sheng Shih
d8727bd98f
Merge "Reload wallpaper after user unlock." into pi-dev am: f687efc455
...
am: 42e687a61a
Change-Id: I75941068d26709dd4184830cc4543389fe54f287
2018-05-07 21:48:04 -07:00
Tyler Gunn
4d2e130fdf
Merge "Make TelecomManager#endCall a public API." into pi-dev am: 872a039ab3
...
am: aae778c669
Change-Id: I9deb321220ca1a058c88ac1dd36cfddd07b25152
2018-05-07 21:38:04 -07:00
Wei Sheng Shih
42e687a61a
Merge "Reload wallpaper after user unlock." into pi-dev
...
am: f687efc455
Change-Id: Ifa0d5f895999f43a759e7322262f26aa97543d3d
2018-05-07 21:23:53 -07:00
Wei Sheng Shih
f687efc455
Merge "Reload wallpaper after user unlock." into pi-dev
2018-05-08 04:13:35 +00:00
Remi NGUYEN VAN
c8613f9965
Merge "Fix testUidPoliciesToString"
2018-05-08 04:13:07 +00:00
Tyler Gunn
aae778c669
Merge "Make TelecomManager#endCall a public API." into pi-dev
...
am: 872a039ab3
Change-Id: Ic52e1705ce497b0a46bb4107ad854a8b939b38b0
2018-05-07 21:11:14 -07:00
Tyler Gunn
872a039ab3
Merge "Make TelecomManager#endCall a public API." into pi-dev
2018-05-08 04:01:35 +00:00
android-build-team Robot
fb8a9ea48b
Merge "Add CLEAR_APP_CACHE check for deletePreloadsFileCache."
2018-05-08 03:55:13 +00:00
Android Build Merger (Role)
5bdda8446b
Merge "Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev am: 1b93e623be am: 87f2b66d88"
2018-05-08 03:34:22 +00:00
Bryan Henry
b6ce3d7557
Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev am: 1b93e623be
...
am: 87f2b66d88
Change-Id: If5f7e7d3dd117c91143b604ba2e594fe06b7e691
2018-05-07 20:33:51 -07:00
android-build-team Robot
2b7c5d7e58
Merge "Align account icon size of ChooseAccountTypeActivity"
2018-05-08 03:33:20 +00:00
Bryan Henry
87f2b66d88
Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev
...
am: 1b93e623be
Change-Id: Ic54d1be1284eb0802aab04b99d835085200fe81b
2018-05-07 20:21:47 -07:00
Bryan Henry
1b93e623be
Merge changes from topic "change-shared-user-apk-cert-pi-dev" into pi-dev
...
* changes:
Allow changing signing cert for system apps that use shared users
Revert "Allow shared users to rotate signing certs in an OTA"
2018-05-08 03:08:19 +00:00
android-build-team Robot
596b65217e
Merge "Adding batterystats history to proto dump."
2018-05-08 02:38:23 +00:00
android-build-team Robot
fe45568a78
Merge "Update text size of overflow number view" into pi-dev am: 414be0b1cb
...
am: b8d7a58c72
Change-Id: Iee66845c12c9a4de95280b602a3c9d4dda777090
2018-05-07 19:29:32 -07:00
android-build-team Robot
db348dd7d1
Merge "Reset the profile when system application change version." into pi-dev am: d24c5de834
...
am: df084360ce
Change-Id: Icf1ef92588e711c599409554830125e7c30cfcbd
2018-05-07 19:24:37 -07:00
android-build-prod (mdb)
4d11d49a7e
Merge "Convert android.test.runner.stubs to Soong" am: 6fa8d06c78 am: c8a0259721
...
am: 3561420fe6
Change-Id: I153ab7500e63f059b08a39bcfb1be508158e98dd
2018-05-07 19:19:31 -07:00
Jean-Michel Trivi
3c417cdbcc
Merge "AudioFocusRequest: fix doc for focus listener dispatch" into pi-dev am: 7d32a1e045
...
am: 3b413dbd11
Change-Id: I6af73b09fbdfbbcb3dc901240329ccbc512cba7e
2018-05-07 19:13:19 -07:00
Svetoslav Ganov
f748f4bd6f
Merge "Expose media projection consent UI to instant apps" into pi-dev am: efaec53af9
...
am: 159b388260
Change-Id: Ia3ce898c0507cf08179baa907b7174041f8e70a9
2018-05-07 19:07:21 -07:00
android-build-team Robot
cdf137e54c
Merge "Unsuspending packages on suspending app data clear" into pi-dev am: 2ba981c6c3
...
am: 9eca2b9259
Change-Id: I01d1dccc4bb552854dd7ccd10d88bcf4d131f1f1
2018-05-07 18:59:59 -07:00
android-build-team Robot
b8d7a58c72
Merge "Update text size of overflow number view" into pi-dev
...
am: 414be0b1cb
Change-Id: I5c0855a4dddd65afd5ea314d831e0f6e04304bf9
2018-05-07 18:58:56 -07:00
Yang Lu
88daf748ac
Merge "Fixes statsd returning too much data at once." into pi-dev am: cdb093e080
...
am: 0e4b1c1bee
Change-Id: Ia470a56187612d4607737410f1abfc8ffac17581
2018-05-07 18:51:22 -07:00
android-build-team Robot
df084360ce
Merge "Reset the profile when system application change version." into pi-dev
...
am: d24c5de834
Change-Id: I79656d5af6a8358e341c7159cce1b59b7320bf3f
2018-05-07 18:49:46 -07:00
android-build-team Robot
414be0b1cb
Merge "Update text size of overflow number view" into pi-dev
2018-05-08 01:47:14 +00:00
dongwan0605.kim
11e7dec156
Update text size of overflow number view
...
When density or font size is updated, overflow number view's size
was not updated.
Test: Group notification with overflow number existing
> Change density or font size > Check overflow number view's size
Change-Id: I6f464b12f83b954f7fbfdd5d64153598b5407e08
Fixes: 79350890
2018-05-08 01:47:08 +00:00
android-build-team Robot
8e44dc88e4
Merge "Fixes first jump of dividerview when invoking splitscreen" into pi-dev am: 3542482875
...
am: 1c9f8555f6
Change-Id: I1ed01150ba0aaede23a9238193126344a38aa6b6
2018-05-07 18:46:20 -07:00
android-build-prod (mdb)
2bf6c453f0
[automerger skipped] Merge "Move SettingsLib tests and EasterEgg to aapt2." am: 846fbd0806 am: cf93b96726 -s ours
...
am: efc5505b7a -s ours
Change-Id: I3996a2af4e940eafcf564c20dacc077dad9d2339
2018-05-07 18:40:37 -07:00
Lin Guo
6b0a41e69b
Merge "Fix build break" into pi-dev am: 49fe27de4b
...
am: dfad0653b2
Change-Id: I6eef38e5a04b978004d55edbc6f966b444e1f29d
2018-05-07 18:32:25 -07:00
android-build-team Robot
d24c5de834
Merge "Reset the profile when system application change version." into pi-dev
2018-05-08 01:31:52 +00:00
android-build-prod (mdb)
3561420fe6
Merge "Convert android.test.runner.stubs to Soong" am: 6fa8d06c78
...
am: c8a0259721
Change-Id: I5c30b9805219d516df9a438b87e28dc775d74557
2018-05-07 18:25:56 -07:00
android-build-team Robot
b60c3da57c
Merge "Remove the clock view when DISABLE_CLOCK is set" into pi-dev am: 6d4917b673
...
am: f2d1a07abe
Change-Id: Ib5d7f1606a90e0f99e7bd4890ee4265a2a268ab7
2018-05-07 18:22:03 -07:00
android-build-prod (mdb)
c8a0259721
Merge "Convert android.test.runner.stubs to Soong"
...
am: 6fa8d06c78
Change-Id: I35d8b4836e58092a2c9158c493af8653e7ffb021
2018-05-07 18:13:01 -07:00
Jean-Michel Trivi
3b413dbd11
Merge "AudioFocusRequest: fix doc for focus listener dispatch" into pi-dev
...
am: 7d32a1e045
Change-Id: Iddf332ab3169b4c1070bbe1dac3bc8c91e8d6ca5
2018-05-07 18:09:51 -07:00
android-build-team Robot
cffc7c5b90
Merge "Simulate handling of event when throttling" into pi-dev am: 0458578642
...
am: 64bc4fab47
Change-Id: I2f87a69a1836cc9b109e78e49b3d0085bfb32b81
2018-05-07 18:03:42 -07:00
Kweku Adams
3d16091dd2
Adding batterystats history to proto dump.
...
It will only print out a dump for userdebug or eng builds.
This is the same change as the pi-dev one (http://ag/3909863 ), but due
to changes in master, that change has a merge conflict, so I have to
create a separate CL for master.
Bug: 77727638
Test: it builds
Change-Id: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74
2018-05-07 17:57:42 -07:00
Jean-Michel Trivi
7d32a1e045
Merge "AudioFocusRequest: fix doc for focus listener dispatch" into pi-dev
2018-05-08 00:53:02 +00:00
android-build-team Robot
9f7fc4af6f
Merge "New FIELD_AUTOFILL_COMPAT_MODE field." into pi-dev am: 88cc74cd6b
...
am: a96a951269
Change-Id: I95154065ebb1660b06d933df367973fcab3a08ea
2018-05-07 17:51:23 -07:00
Svetoslav Ganov
159b388260
Merge "Expose media projection consent UI to instant apps" into pi-dev
...
am: efaec53af9
Change-Id: I581cb12f4a164f21a27b0c18a31fe97ef3dc4320
2018-05-07 17:41:11 -07:00
Rob Carr
5671090f26
Merge "WindowManager: Emit windows from forAllWindows closer to Z-order" into pi-dev am: 17f19e4425
...
am: d300337215
Change-Id: Icd053f14904767806720b1fac58d8d4bd5682dda
2018-05-07 17:38:22 -07:00
Lucas Dupin
2237146e26
Merge "Update date during time tick event" into pi-dev am: e22a7bc9d4
...
am: 2e9aeeaa64
Change-Id: I67a351f81865563981955f82ccf1b4c1568b1f27
2018-05-07 17:27:41 -07:00