OSDN Git Service
Android Build Merger (Role) [Fri, 26 Jan 2018 00:54:12 +0000 (00:54 +0000)]
Merge changes from topic "am-
1138e40322094c4891e839a98a173b89"
* changes:
Merge changes from topic "am-
d53588def0a94e089fd73c9ebe97efe7" into oc-mr1-dev-plus-aosp am:
63cfac44f0
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours am:
4dfc160224 -s ours am:
4685af2a89 -s ours am:
2489d286fd -s ours
Android Build Merger (Role) [Fri, 26 Jan 2018 00:53:31 +0000 (00:53 +0000)]
Merge changes from topic "am-
d53588def0a94e089fd73c9ebe97efe7" into oc-mr1-dev-plus-aosp
am:
63cfac44f0
Change-Id: I4191bac61e5f948b35252c241e882c8e6fb21f04
Winson Chung [Fri, 26 Jan 2018 00:46:34 +0000 (00:46 +0000)]
Merge changes from topics "reland_recents_animation", " reland_recents_animation"
* changes:
Fix issue with reparenting stacks on displays.
Revert "Revert "4/ Update SysUI shared lib for Recents transition""
Revert "Revert "3/ Add input consumer to capture touches during a Recents transition""
Revert "Revert "2/ Add support for remote Recents animation""
Revert "Revert "1/ Create display content window controller to position stacks in the display""
Yu-Han Yang [Fri, 26 Jan 2018 00:41:35 +0000 (00:41 +0000)]
Merge "Add gnssRequestLocationCb to GnssCallback"
Android Build Merger (Role) [Fri, 26 Jan 2018 00:40:53 +0000 (00:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours am:
4dfc160224 -s ours am:
4685af2a89 -s ours
am:
2489d286fd -s ours
Change-Id: If81bb102363b01176fadabd33e5ad07527a523e5
Bryce Lee [Fri, 26 Jan 2018 00:39:24 +0000 (00:39 +0000)]
Merge "Clear calling identity when get package uid."
Bryce Lee [Thu, 25 Jan 2018 22:08:13 +0000 (14:08 -0800)]
Clear calling identity when get package uid.
Previously, the identity was cleared in LaunchingAppsService before
calling into ActivityManagerService. This would allow
ActivityManagerService to call PackageManager#getPackageUid. Since
the calling identity is now associated with the SafeActivityOptions,
this was removed from LaunchingAppsService. As a result, a
SecurityException is encountered, and app shortcuts from managed
profiles no longer work.
This changelist addresses the issue by clearing the calling identity
in ActivityManagerService. This reduced scope still allows the
SafeActivityOptions to be created with the proper uid associated.
Change-Id: Ic32eae5d7b9e4053e4177938a8c2859385d9eeae
Fixes:
72498756
Test: atest CtsShortcutHostTestCases
Test: atest CtsShortcutManagerTestCases
TreeHugger Robot [Fri, 26 Jan 2018 00:29:19 +0000 (00:29 +0000)]
Merge "Calc job standby runnability based on last job execution..."
Winson Chung [Fri, 26 Jan 2018 00:16:14 +0000 (00:16 +0000)]
Merge "Add feature check before entering PIP."
Android Build Merger (Role) [Fri, 26 Jan 2018 00:09:32 +0000 (00:09 +0000)]
Merge "Merge "Show a warning toast/dialog when an app uses hidden APIs" am:
fbef950d95 am:
d750a7c68c am:
61c4d63c98"
TreeHugger Robot [Fri, 26 Jan 2018 00:09:14 +0000 (00:09 +0000)]
Merge "Adding privacy tags to JobScheduler and co."
TreeHugger Robot [Fri, 26 Jan 2018 00:09:09 +0000 (00:09 +0000)]
Merge "Add setting to control vibration intensity."
TreeHugger Robot [Fri, 26 Jan 2018 00:09:03 +0000 (00:09 +0000)]
Merge "Make tests less flaky?"
David Brazdil [Fri, 26 Jan 2018 00:07:33 +0000 (00:07 +0000)]
Merge "Show a warning toast/dialog when an app uses hidden APIs" am:
fbef950d95 am:
d750a7c68c
am:
61c4d63c98
Change-Id: If75eacd24b072e382042885e20434b184dc91426
TreeHugger Robot [Fri, 26 Jan 2018 00:01:27 +0000 (00:01 +0000)]
Merge "Fix a bug of reading files with "_" separator"
Android Build Merger (Role) [Fri, 26 Jan 2018 00:01:19 +0000 (00:01 +0000)]
Merge changes from topic "am-
3606a5e21978498eb7b6d0040eb1a22d"
* changes:
Merge changes from topic "am-
56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp am:
33fc64360a
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours am:
6ccac2ffc3 -s ours am:
6e0c678836 -s ours
Android Build Merger (Role) [Fri, 26 Jan 2018 00:00:44 +0000 (00:00 +0000)]
Merge changes from topic "am-
56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp
am:
33fc64360a
Change-Id: I37f0181e69f11c13e01a33f68f687c5810a4f865
Tarandeep Singh [Thu, 25 Jan 2018 23:57:34 +0000 (23:57 +0000)]
Merge "Make IMS.setBackDisposition() work."
Android Build Merger (Role) [Thu, 25 Jan 2018 23:47:28 +0000 (23:47 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours am:
6ccac2ffc3 -s ours
am:
6e0c678836 -s ours
Change-Id: I127c7d6efceb5ac22e8c16e71cc531912f6b1b5c
Selim Cinek [Thu, 25 Jan 2018 23:37:38 +0000 (23:37 +0000)]
Merge "Fixed a crash in SystemUI"
TreeHugger Robot [Thu, 25 Jan 2018 23:25:48 +0000 (23:25 +0000)]
Merge "Don't take screenshot when no WSA surfaces are visible."
Android Build Merger (Role) [Thu, 25 Jan 2018 23:23:05 +0000 (23:23 +0000)]
Merge "Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d am:
5ba62a2194" into oc-mr1-dev-plus-aosp am:
0bde9c4355"
Android Build Merger (Role) [Thu, 25 Jan 2018 23:22:31 +0000 (23:22 +0000)]
Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d am:
5ba62a2194" into oc-mr1-dev-plus-aosp
am:
0bde9c4355
Change-Id: Id17724faabe77fb7eaad7d3a7e009fb57f0d23d0
Dmitry Dementyev [Thu, 25 Jan 2018 23:15:50 +0000 (23:15 +0000)]
Merge "Handle case when PlatformKey is invalid."
Android Build Merger (Role) [Thu, 25 Jan 2018 23:06:23 +0000 (23:06 +0000)]
Merge "Merge "Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98 am:
ebc0afd811" into oc-mr1-dev-plus-aosp am:
954ba2c6a1"
Android Build Merger (Role) [Thu, 25 Jan 2018 23:03:11 +0000 (23:03 +0000)]
Merge "Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98 am:
ebc0afd811" into oc-mr1-dev-plus-aosp
am:
954ba2c6a1
Change-Id: I218eb054ef0da896c72674c597249c6a5120500d
TreeHugger Robot [Thu, 25 Jan 2018 22:59:32 +0000 (22:59 +0000)]
Merge "Update documentation for the clock parameters"
TreeHugger Robot [Thu, 25 Jan 2018 22:58:49 +0000 (22:58 +0000)]
Merge "Store WebView package signatures as Signatures instead of Strings"
TreeHugger Robot [Thu, 25 Jan 2018 22:58:15 +0000 (22:58 +0000)]
Merge "MediaPlayer2: remove unused methods"
Android Build Merger (Role) [Thu, 25 Jan 2018 22:53:27 +0000 (22:53 +0000)]
Merge changes from topic "am-
016e80a61e3c432b8a1915663d9a8fb1"
* changes:
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp am:
3a96381c69
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours am:
1ed0a31ee3 -s ours
Android Build Merger (Role) [Thu, 25 Jan 2018 22:52:50 +0000 (22:52 +0000)]
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
am:
3a96381c69
Change-Id: Ie1fb2e5843f151447de728348a64eb0b5a8699b5
TreeHugger Robot [Thu, 25 Jan 2018 22:47:54 +0000 (22:47 +0000)]
Merge "Add AbstractThreadedSyncAdapter#onUnsyncableAccount API"
TreeHugger Robot [Thu, 25 Jan 2018 22:38:00 +0000 (22:38 +0000)]
Merge "Move correct stack to front when split-screen is dismissed"
Android Build Merger (Role) [Thu, 25 Jan 2018 22:37:07 +0000 (22:37 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours
am:
1ed0a31ee3 -s ours
Change-Id: I9cbde4b6406e394293ad3ad51dc6000f7c68e179
Android Build Merger (Role) [Thu, 25 Jan 2018 22:35:48 +0000 (22:35 +0000)]
Merge changes from topic "am-
d53588def0a94e089fd73c9ebe97efe7" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev am:
bcf3392856 am:
0fe900767e am:
5e991b9ef8
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours am:
4dfc160224 -s ours am:
4685af2a89 -s ours
Android Build Merger (Role) [Thu, 25 Jan 2018 22:35:15 +0000 (22:35 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev am:
bcf3392856 am:
0fe900767e
am:
5e991b9ef8
Change-Id: Ia332ea53b0f50bba13caa4e1e86f1d13e67e8121
David Brazdil [Thu, 25 Jan 2018 22:32:28 +0000 (22:32 +0000)]
Merge "Show a warning toast/dialog when an app uses hidden APIs" am:
fbef950d95
am:
d750a7c68c
Change-Id: I9b62537d76e4ceb7ce03ca4de5ccf5a182c4439c
Android Build Merger (Role) [Thu, 25 Jan 2018 22:30:49 +0000 (22:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours am:
4dfc160224 -s ours
am:
4685af2a89 -s ours
Change-Id: I1d757f2124f18a50281f96bb8b579f895dc1f3fb
Winson Chung [Thu, 25 Jan 2018 21:58:20 +0000 (13:58 -0800)]
Add feature check before entering PIP.
Bug:
72063615
Test: ActivityManagerPinnedStackTests
Change-Id: I4bed3a39c28c62121db47b8a61dda2516e41d245
Matthew Fritze [Thu, 25 Jan 2018 22:25:54 +0000 (22:25 +0000)]
Merge "Add Setting Slices Contract file"
Android Build Merger (Role) [Thu, 25 Jan 2018 22:24:12 +0000 (22:24 +0000)]
Merge changes from topic "am-
56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4 am:
94b7fafc69 am:
e977655e31
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours am:
6ccac2ffc3 -s ours
Android Build Merger (Role) [Thu, 25 Jan 2018 22:23:29 +0000 (22:23 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4 am:
94b7fafc69
am:
e977655e31
Change-Id: I7e50ca49c650aca991556f6d99c926633183bd89
Android Build Merger (Role) [Thu, 25 Jan 2018 22:22:00 +0000 (22:22 +0000)]
Merge "Merge "Fill in methods in EuiccCardController." am:
197f072da2 am:
d143bb628a am:
d19ef3fa1b"
TreeHugger Robot [Thu, 25 Jan 2018 22:21:30 +0000 (22:21 +0000)]
Merge "Update to the ActivityManager proto"
Holly Jiuyu Sun [Thu, 25 Jan 2018 22:21:13 +0000 (22:21 +0000)]
Merge "Fill in methods in EuiccCardController." am:
197f072da2 am:
d143bb628a
am:
d19ef3fa1b
Change-Id: I8189d3b34e4966c873e689c8c90ca6a8f2b2ec49
Android Build Merger (Role) [Thu, 25 Jan 2018 22:20:40 +0000 (22:20 +0000)]
Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d am:
5ba62a2194" into oc-mr1-dev-plus-aosp
Hugo Benichi [Thu, 25 Jan 2018 22:19:53 +0000 (22:19 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d
am:
5ba62a2194
Change-Id: I6c30a47ed35394d63b266250e3525976844b0e8f
Winson Chung [Thu, 25 Jan 2018 17:44:30 +0000 (09:44 -0800)]
Fix issue with reparenting stacks on displays.
Bug:
72489026
Test: ActivityManagerMultiDisplayTests
Change-Id: I04d5971206b3b31ee349733de623edfff4c97222
Android Build Merger (Role) [Thu, 25 Jan 2018 22:17:14 +0000 (22:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours
am:
6ccac2ffc3 -s ours
Change-Id: Idf30f2ec1c917c94cdc27959df184713db36bef9
Android Build Merger (Role) [Thu, 25 Jan 2018 22:13:13 +0000 (22:13 +0000)]
Merge "Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98 am:
ebc0afd811" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 25 Jan 2018 22:11:40 +0000 (22:11 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev am:
bcf3392856
am:
0fe900767e
Change-Id: I3b62983c0c6eb2bbfbf74739e8d5703ddcd56303
Android Build Merger (Role) [Thu, 25 Jan 2018 22:10:31 +0000 (22:10 +0000)]
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac am:
38508aeaf5
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours
Andreas Gampe [Thu, 25 Jan 2018 22:10:27 +0000 (22:10 +0000)]
Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98
am:
ebc0afd811
Change-Id: Ie8b991014a43ca4fba83aeab3ba826996d2813df
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:56 +0000 (22:08 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae am:
6c1ecb973c am:
876a1f75a3
am:
06e56a4086
Change-Id: I9a000a352000e4b4faf594794f9366572a98b447
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:51 +0000 (22:08 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac
am:
38508aeaf5
Change-Id: Icf34d805cfd9274e1d00dd35b4db8afa1356742b
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:03 +0000 (22:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours
am:
4dfc160224 -s ours
Change-Id: I9f96ce4c677fafd32b612735089d3ae97d8fa16b
Holly Jiuyu Sun [Thu, 25 Jan 2018 22:06:08 +0000 (22:06 +0000)]
Merge "Fill in methods in EuiccCardController." am:
197f072da2
am:
d143bb628a
Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd
Android Build Merger (Role) [Thu, 25 Jan 2018 22:04:58 +0000 (22:04 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4
am:
94b7fafc69
Change-Id: Id25852c4f17eb92cf9bda17a5670bcb104ca0f78
Android Build Merger (Role) [Thu, 25 Jan 2018 22:02:48 +0000 (22:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours
am:
ea52aec628 -s ours
Change-Id: I3afa944070a378a25dd38551cfd02e397ec7f298
Android Build Merger (Role) [Thu, 25 Jan 2018 22:01:50 +0000 (22:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours am:
114cd10ac9 -s ours am:
78578a1294 -s ours
am:
ed4ea1e66a -s ours
Change-Id: I2eab9f0eb7f7d4e0a9f9fe7daeecb472dc9b0e9e
David Brazdil [Thu, 25 Jan 2018 22:01:49 +0000 (22:01 +0000)]
Merge "Show a warning toast/dialog when an app uses hidden APIs"
am:
fbef950d95
Change-Id: Icab7166bf83d2920c8d3f22774eafa4aea9fdaa4
Android Build Merger (Role) [Thu, 25 Jan 2018 22:01:14 +0000 (22:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours
am:
a8e2306430 -s ours
Change-Id: I900c69922ed9ca74c8d23dc5ac34678177f0d373
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:08 +0000 (21:56 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae am:
6c1ecb973c
am:
876a1f75a3
Change-Id: I0310d50282b343261575d20cda3536667c8478b9
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:02 +0000 (21:56 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours am:
b8bc53ecc3 -s ours am:
d68ab1fd08 -s ours"
Android Build Merger (Role) [Thu, 25 Jan 2018 21:55:39 +0000 (21:55 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours am:
b8bc53ecc3 -s ours
am:
d68ab1fd08 -s ours
Change-Id: Ie0da2e283b1807b5d0986433f1c7dd3c1b727a86
Mady Mellor [Thu, 25 Jan 2018 21:55:21 +0000 (21:55 +0000)]
Merge "Update Keyguard to use RowContent / ListContent instead of SliceQuery where possible"
Hugo Benichi [Thu, 25 Jan 2018 21:55:08 +0000 (21:55 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback"
am:
93b1787a3d
Change-Id: Ife421f2612b0bfc2d6be5c6d174d24abd4d2e2fb
Android Build Merger (Role) [Thu, 25 Jan 2018 21:53:50 +0000 (21:53 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa
am:
981bc5a1ac
Change-Id: I2a52f4b62e872e32d07e0e994c90282fa20bc946
Android Build Merger (Role) [Thu, 25 Jan 2018 21:53:24 +0000 (21:53 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev
am:
bcf3392856
Change-Id: Ic06a49e43f4f5e1ebc4aef0f66f0ecc1296eb843
TreeHugger Robot [Thu, 25 Jan 2018 21:53:12 +0000 (21:53 +0000)]
Merge "VideoView2: Remove APIs supported by MediaSession"
yro [Thu, 25 Jan 2018 21:52:20 +0000 (13:52 -0800)]
Fix a bug of reading files with "_" separator
Test: manual testing
Change-Id: Ibb19336122684712b3eb73088553acd9438b7611
Android Build Merger (Role) [Thu, 25 Jan 2018 21:52:14 +0000 (21:52 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707
am:
d7b199be9a -s ours
Change-Id: I7aa21a0d4310323f666a5326a019555d15e006ff
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:53 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours am:
114cd10ac9 -s ours
am:
78578a1294 -s ours
Change-Id: I39d1e16f34fea09009c039a955040e811988d422
Andreas Gampe [Thu, 25 Jan 2018 21:50:42 +0000 (21:50 +0000)]
Merge "ActivityManager: Add support for agents on startup"
am:
d5cba89b98
Change-Id: Iee82ac1a08183857ea4fcf2d67b99dede5d5a2ae
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:18 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours
am:
cd4371f3cc -s ours
Change-Id: Ie76e94193cbb2c18fbe4d481b8b4bd0b44648488
Android Build Merger (Role) [Thu, 25 Jan 2018 21:49:42 +0000 (21:49 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev
am:
f310c792d4
Change-Id: Ifc8e1838bea63b3401dbd41e2d1dd04ca67b1eb2
Android Build Merger (Role) [Thu, 25 Jan 2018 21:48:48 +0000 (21:48 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd
am:
8eb39fb0f4 -s ours
Change-Id: Iadcf60e51485dc0952c6f7800a996e91585854a5
Holly Jiuyu Sun [Thu, 25 Jan 2018 21:47:46 +0000 (21:47 +0000)]
Merge "Fill in methods in EuiccCardController."
am:
197f072da2
Change-Id: I9d8db8ef23c7a469b38748ba8fd4b3a91ca4506e
Android Build Merger (Role) [Thu, 25 Jan 2018 21:46:22 +0000 (21:46 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
am:
806b4573aa
Change-Id: I1cfe38aa5a80dd142ef80375957766ce6b8daf99
Android Build Merger (Role) [Thu, 25 Jan 2018 21:45:31 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
am:
0a09cd4b21 -s ours
Change-Id: I939c7d74e9c575b6ed205dc5713579bb03cb31d5
Winson Chung [Thu, 25 Jan 2018 17:46:16 +0000 (17:46 +0000)]
Revert "Revert "4/ Update SysUI shared lib for Recents transition""
This reverts commit
f6401c0284e6a8491b6bc39c36de8d5568feb880.
Reason for revert: Testing relanding changes with ag/
3515280
Change-Id: Ibb8d4868fe2cc1053b528ed757bd3ec1f9c10355
Winson Chung [Thu, 25 Jan 2018 17:46:11 +0000 (17:46 +0000)]
Revert "Revert "3/ Add input consumer to capture touches during a Recents transition""
This reverts commit
86733be8f65ddc01a0dc7f821fedbd852eabcb39.
Reason for revert: Testing relanding changes with ag/
3515280
Change-Id: I37172d809db48622040d5fa41c4d4dcd077a9328
Winson Chung [Thu, 25 Jan 2018 17:46:20 +0000 (17:46 +0000)]
Revert "Revert "2/ Add support for remote Recents animation""
This reverts commit
9f8518e532e41ba57916afc49bba72bc23ad3eda.
Reason for revert: Testing relanding changes with ag/
3515280
Change-Id: I410bd752c815a5b998a719453def01e00a9d47c8
Winson Chung [Thu, 25 Jan 2018 17:46:06 +0000 (17:46 +0000)]
Revert "Revert "1/ Create display content window controller to position stacks in the display""
This reverts commit
7ef6d3371842748eebc3361eedc2dd492b39cfad.
Reason for revert: Testing relanding changes with ag/
3515280
Change-Id: I44c9dcd3c68f05d57ffb47c63c08a30279bb5b22
TreeHugger Robot [Thu, 25 Jan 2018 21:39:44 +0000 (21:39 +0000)]
Merge "Deal gracefully with cancel of nonexistent jobs"
TreeHugger Robot [Thu, 25 Jan 2018 21:32:39 +0000 (21:32 +0000)]
Merge "Update cross_profile_apps_thumbnail_enter as per task_open_enter"
TreeHugger Robot [Thu, 25 Jan 2018 21:30:22 +0000 (21:30 +0000)]
Merge "Internal Framework changes needed by DocumentUI's ScopedAccessProvider:"
Robert Shih [Thu, 25 Jan 2018 21:27:39 +0000 (21:27 +0000)]
Merge "MediaExtractor: getSampleSize API"
TreeHugger Robot [Thu, 25 Jan 2018 21:19:22 +0000 (21:19 +0000)]
Merge "Disable statsd that was accidentally enabled in ag/
3480570"
TreeHugger Robot [Thu, 25 Jan 2018 21:14:44 +0000 (21:14 +0000)]
Merge "Disable quick step when notification is open"
TreeHugger Robot [Thu, 25 Jan 2018 20:50:15 +0000 (20:50 +0000)]
Merge "Fade the quick scrub track when nav bar intensity changes"
Jason Monk [Thu, 25 Jan 2018 20:44:04 +0000 (15:44 -0500)]
Make tests less flaky?
Test: runtest systemui
Change-Id: Ib70eed931d3e927b0d80d694b1751942c1b64c56
TreeHugger Robot [Thu, 25 Jan 2018 20:31:07 +0000 (20:31 +0000)]
Merge "add getMetrics() apis for AudioTrack and AudioRecord"
Wei Jia [Thu, 25 Jan 2018 18:13:42 +0000 (10:13 -0800)]
MediaPlayer2: remove unused methods
Also use shared lib of libutils.
Test: MediaPlayer2 plays
Bug:
63934228
Change-Id: I6f4f4e927cccd11a0e43c84347bcdc4e3a3b88de
TreeHugger Robot [Thu, 25 Jan 2018 20:18:28 +0000 (20:18 +0000)]
Merge "Fix missing textservices dump in 'adb bugreport'"
Dmitry Dementyev [Wed, 24 Jan 2018 19:11:40 +0000 (11:11 -0800)]
Handle case when PlatformKey is invalid.
When Platform key is invalidated, all applicatio keys wraped into it
needs to be marked as unrecoverable.
It can happen when user removes screen lock.
Bug:
72443379
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7ae257f8fdb4b6abf789887f15b02a2fe370dfb8
David Brazdil [Thu, 25 Jan 2018 19:53:13 +0000 (19:53 +0000)]
Merge "Show a warning toast/dialog when an app uses hidden APIs"
Android Build Merger (Role) [Thu, 25 Jan 2018 19:25:06 +0000 (19:25 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae
am:
6c1ecb973c
Change-Id: Ie305f8b8f404f9dcf19f53d51fca7eafed03faaa
Android Build Merger (Role) [Thu, 25 Jan 2018 19:23:56 +0000 (19:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours
am:
b8bc53ecc3 -s ours
Change-Id: Ia2241da1274d0436eb8eafc70addd55f8d99c45b
Treehugger Robot [Thu, 25 Jan 2018 19:23:18 +0000 (19:23 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback"
OSDN Git Service
