OSDN Git Service
Android Build Merger (Role) [Fri, 26 Jan 2018 01:32:26 +0000 (01:32 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d am:
6866408a78 -s ours am:
abad95933a -s ours am:
106209572e -s ours
am:
0618d2da32 -s ours
Change-Id: I0981dd8d5f121be02a243375bf713bb9af61cc14
Android Build Merger (Role) [Fri, 26 Jan 2018 01:31:02 +0000 (01:31 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev am:
066be5e6e1 am:
6981d14838 am:
8b1d663a52
am:
09a719bbbc
Change-Id: I0475d14938ab77db8abf46dec33330bf95f35bf8
Android Build Merger (Role) [Fri, 26 Jan 2018 01:23:50 +0000 (01:23 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d am:
5cd687505a -s ours am:
77803cc4fa -s ours am:
4f65db7421 -s ours am:
b98b5de9f3 -s ours"
Android Build Merger (Role) [Fri, 26 Jan 2018 01:23:28 +0000 (01:23 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d am:
5cd687505a -s ours am:
77803cc4fa -s ours am:
4f65db7421 -s ours
am:
b98b5de9f3 -s ours
Change-Id: I6184880eb16de38448be52e343aa62149ce75265
Android Build Merger (Role) [Fri, 26 Jan 2018 01:22:30 +0000 (01:22 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb am:
350fc5d06a -s ours am:
02ee278871 -s ours am:
1e9b3172bc -s ours am:
ece99d6601 -s ours"
Android Build Merger (Role) [Fri, 26 Jan 2018 01:21:59 +0000 (01:21 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb am:
350fc5d06a -s ours am:
02ee278871 -s ours am:
1e9b3172bc -s ours
am:
ece99d6601 -s ours
Change-Id: I5e3a3e340ff1d43eca88d8e5feb5c4c327077f2c
Android Build Merger (Role) [Fri, 26 Jan 2018 01:20:27 +0000 (01:20 +0000)]
Merge changes from topic "am-
747e0d3864f94f34be804843398b37a5"
* changes:
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev am:
11c37d01f7 am:
e72f06b29b am:
b7cd649409 am:
7bd1ae6af0
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5 am:
6f59280206 -s ours am:
f19c7ab533 -s ours am:
1860adf0cd -s ours am:
0d71353f8e -s ours
Android Build Merger (Role) [Fri, 26 Jan 2018 01:19:58 +0000 (01:19 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev am:
11c37d01f7 am:
e72f06b29b am:
b7cd649409
am:
7bd1ae6af0
Change-Id: I0f9dccbbb60224f663e288505bcd8e8fd2aaccc5
TreeHugger Robot [Fri, 26 Jan 2018 01:19:33 +0000 (01:19 +0000)]
Merge "Fix location QuickSettings bug"
TreeHugger Robot [Fri, 26 Jan 2018 01:16:31 +0000 (01:16 +0000)]
Merge "Fixed the launch animation with flag auto cancel"
Android Build Merger (Role) [Fri, 26 Jan 2018 01:15:26 +0000 (01:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5 am:
6f59280206 -s ours am:
f19c7ab533 -s ours am:
1860adf0cd -s ours
am:
0d71353f8e -s ours
Change-Id: I1d84a6e168f9cd81457512d9ee1bb76da6fc231d
Android Build Merger (Role) [Fri, 26 Jan 2018 01:14:17 +0000 (01:14 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b am:
7b9a09d8d2 -s ours am:
bf2ee3c9dd -s ours am:
22c5a224c7 -s ours am:
51cee7c43f -s ours"
Android Build Merger (Role) [Fri, 26 Jan 2018 01:13:58 +0000 (01:13 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b am:
7b9a09d8d2 -s ours am:
bf2ee3c9dd -s ours am:
22c5a224c7 -s ours
am:
51cee7c43f -s ours
Change-Id: I7d7b6566010cab539005a0afd40e003519bfd9cb
Android Build Merger (Role) [Fri, 26 Jan 2018 01:12:25 +0000 (01:12 +0000)]
Merge changes from topic "am-
1e00ca1a840d4d319db537c2c1612f26"
* changes:
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev am:
6367f8199d am:
f1d0f9652c am:
33e2d30f87 am:
e95f894e67
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7 am:
387047a201 -s ours am:
f12ba9fee4 -s ours am:
3c2c04a47d -s ours am:
ab6b536629 -s ours
Bryce Lee [Fri, 26 Jan 2018 01:11:56 +0000 (01:11 +0000)]
Merge "Perform Activity#onStart when launching in LocalActivityManager."
Android Build Merger (Role) [Fri, 26 Jan 2018 01:11:39 +0000 (01:11 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev am:
6367f8199d am:
f1d0f9652c am:
33e2d30f87
am:
e95f894e67
Change-Id: I563b44bf46feb599982e2754db80cd2cff355fcc
Bryce Lee [Wed, 24 Jan 2018 00:18:32 +0000 (16:18 -0800)]
Perform Activity#onStart when launching in LocalActivityManager.
We move to the start state when launching a tabbed activity through
LocalActivityManager, but currently do not inform the activity
thread due to changes in how ActivityThread is updated through the
ActivityLifecycler. This changelist addresses this issue.
Change-Id: Ibc2bda39617e1741bb3ee8637a182dc9f14dd61d
Fixes:
70813462
Fixes:
70812753
Test: atest CtsAppTestCases:android.app.cts.LifecycleTest
Test: atest LocalActivityManagerTest
Test: atest ActivityGroupTest
TreeHugger Robot [Fri, 26 Jan 2018 01:10:16 +0000 (01:10 +0000)]
Merge changes from topic "product_partition"
* changes:
Read media files from /product/media/audio
Support /product partition
Android Build Merger (Role) [Fri, 26 Jan 2018 01:07:08 +0000 (01:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7 am:
387047a201 -s ours am:
f12ba9fee4 -s ours am:
3c2c04a47d -s ours
am:
ab6b536629 -s ours
Change-Id: I7b8b594f6c3745fcbb5e16353eae3eacfba2c94b
Android Build Merger (Role) [Fri, 26 Jan 2018 01:05:38 +0000 (01:05 +0000)]
Merge changes from topic "am-
0ee32b8ade9b4288bb89d13c68de291f"
* changes:
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev am:
eb9a92f942 am:
939313310b am:
6a423ee7ce am:
91de2d1cd0
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199 am:
a9d64326ad -s ours am:
8a35a13afe -s ours am:
73f06fe35f -s ours am:
3450afaf04 -s ours
Android Build Merger (Role) [Fri, 26 Jan 2018 01:04:59 +0000 (01:04 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev am:
eb9a92f942 am:
939313310b am:
6a423ee7ce
am:
91de2d1cd0
Change-Id: Ie7981e0c2396db68892f95605c9d5b0107f8d0de
TreeHugger Robot [Fri, 26 Jan 2018 01:02:23 +0000 (01:02 +0000)]
Merge "Fix command line tool to set the right privacy enum."
Android Build Merger (Role) [Fri, 26 Jan 2018 01:00:20 +0000 (01:00 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199 am:
a9d64326ad -s ours am:
8a35a13afe -s ours am:
73f06fe35f -s ours
am:
3450afaf04 -s ours
Change-Id: I2d014e418e03155ad3829999f3bfe75795198062
TreeHugger Robot [Fri, 26 Jan 2018 00:54:34 +0000 (00:54 +0000)]
Merge "Add more privacy tags and disable procrank util figure out permission to run the command"
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"
Selim Cinek [Thu, 25 Jan 2018 20:22:41 +0000 (12:22 -0800)]
Fixed the launch animation with flag auto cancel
Previously the cancelling wasn't delayed until the
panel collapsed, leading to bad transitions and
animations. Also fixed double clicks better.
Change-Id: I2523e226b60b3d5744a920582cb99f5ca8042fdc
Fixes:
69168591
Test: add notification with auto cancel, click on it
Android Build Merger (Role) [Thu, 25 Jan 2018 23:29:49 +0000 (23:29 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d am:
6866408a78 -s ours am:
abad95933a -s ours
am:
106209572e -s ours
Change-Id: Ic6e35cc2b54e9d7b9e8642839780e174b233de2d
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:24:52 +0000 (23:24 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev am:
066be5e6e1 am:
6981d14838
am:
8b1d663a52
Change-Id: I4c09d6a137a6fbaa0c945556d8ae9496f8bd7b81
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
Android Build Merger (Role) [Thu, 25 Jan 2018 23:19:27 +0000 (23:19 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d am:
5cd687505a -s ours am:
77803cc4fa -s ours
am:
4f65db7421 -s ours
Change-Id: Ia39df9681739abb613a586c02b72c103868befa0
Android Build Merger (Role) [Thu, 25 Jan 2018 23:17:31 +0000 (23:17 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb am:
350fc5d06a -s ours am:
02ee278871 -s ours
am:
1e9b3172bc -s ours
Change-Id: Idd53800a33435dcff27f6bc904349560dea039cd
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:15:36 +0000 (23:15 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev am:
11c37d01f7 am:
e72f06b29b
am:
b7cd649409
Change-Id: Ia143af5bd7d0428697039726dfe661e40d5b4fab
Android Build Merger (Role) [Thu, 25 Jan 2018 23:11:49 +0000 (23:11 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5 am:
6f59280206 -s ours am:
f19c7ab533 -s ours
am:
1860adf0cd -s ours
Change-Id: I834f8a47ed9a76b0efb9b98fdeb3ea779444c1c3
Android Build Merger (Role) [Thu, 25 Jan 2018 23:10:18 +0000 (23:10 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b am:
7b9a09d8d2 -s ours am:
bf2ee3c9dd -s ours
am:
22c5a224c7 -s ours
Change-Id: I55e03b6e57defd4f9ae37fb732e929612e26fce5
Android Build Merger (Role) [Thu, 25 Jan 2018 23:07:53 +0000 (23:07 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev am:
6367f8199d am:
f1d0f9652c
am:
33e2d30f87
Change-Id: I9feb53a57b4d76de983f589d24d4ef03fcd7f2b0
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:32 +0000 (23:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7 am:
387047a201 -s ours am:
f12ba9fee4 -s ours
am:
3c2c04a47d -s ours
Change-Id: I040121c18d1cc3d6915068e885a62b65d997a530
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
Android Build Merger (Role) [Thu, 25 Jan 2018 23:01:22 +0000 (23:01 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev am:
eb9a92f942 am:
939313310b
am:
6a423ee7ce
Change-Id: Ifeab0174b98a7755f246966e6e689d46cdbacdbc
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:57:14 +0000 (22:57 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199 am:
a9d64326ad -s ours am:
8a35a13afe -s ours
am:
73f06fe35f -s ours
Change-Id: Ie7b7de25c5f5340f37a20d02db6b5a1bb37e781f
Android Build Merger (Role) [Thu, 25 Jan 2018 22:54:55 +0000 (22:54 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d am:
6866408a78 -s ours
am:
abad95933a -s ours
Change-Id: Idf38d6f4b8aa647338e2524e40f3319755b3f680
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:53:14 +0000 (22:53 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev am:
066be5e6e1
am:
6981d14838
Change-Id: Icca4a7d217d1bc80c6e109b51b2e54d43ad78684
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"
Android Build Merger (Role) [Thu, 25 Jan 2018 22:47:33 +0000 (22:47 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d am:
5cd687505a -s ours
am:
77803cc4fa -s ours
Change-Id: If1e29e82960702d59818a245d5a4d0e3fc0cef10
Android Build Merger (Role) [Thu, 25 Jan 2018 22:45:48 +0000 (22:45 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb am:
350fc5d06a -s ours
am:
02ee278871 -s ours
Change-Id: Ice440c8517e49f87b42dadfe2a728e65c9a3bcaf
Android Build Merger (Role) [Thu, 25 Jan 2018 22:43:37 +0000 (22:43 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev am:
11c37d01f7
am:
e72f06b29b
Change-Id: I06f2d1af886d01b0cbf3429b5d9e361e4b03fe68
Android Build Merger (Role) [Thu, 25 Jan 2018 22:40:03 +0000 (22:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5 am:
6f59280206 -s ours
am:
f19c7ab533 -s ours
Change-Id: I25a06490c9bed46c67d6b8ab7a541015e45086c3
Yi Jin [Thu, 25 Jan 2018 22:38:10 +0000 (14:38 -0800)]
Add more privacy tags and disable procrank util figure out permission to
run the command
Test: manually flushed to device and run
out/host/linux-x86/bin/incident_report -w -p <A/E/L> <section>
Change-Id: I7c1b6bc03a26de95cb2397d8d653b3b9b3c0e103
Android Build Merger (Role) [Thu, 25 Jan 2018 22:38:06 +0000 (22:38 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b am:
7b9a09d8d2 -s ours
am:
bf2ee3c9dd -s ours
Change-Id: If22ddf2b413bf74534addcabcb3477097411d542
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:27 +0000 (22:35 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev am:
6367f8199d
am:
f1d0f9652c
Change-Id: I423e13a45ec384e625db0b8015c394f88b888ac1
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:31:56 +0000 (22:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7 am:
387047a201 -s ours
am:
f12ba9fee4 -s ours
Change-Id: I5356cae2b66a847ac9622d4c866c592f8f663ba0
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
Android Build Merger (Role) [Thu, 25 Jan 2018 22:27:07 +0000 (22:27 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev am:
eb9a92f942
am:
939313310b
Change-Id: I7f444ed85aad3b0eedcab0d537d3e18340d5a506
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
Android Build Merger (Role) [Thu, 25 Jan 2018 22:26:21 +0000 (22:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d
am:
6866408a78 -s ours
Change-Id: I33a4d20f2fad121680ee0e7d6f68135f41d23ae1
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)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199 am:
a9d64326ad -s ours
am:
8a35a13afe -s ours
Change-Id: I1df7859e4421fdada6d170ad3a5780ebd359403f
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:47 +0000 (22:22 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev
am:
066be5e6e1
Change-Id: Icd0d4d7eccd19fe58e7523f1be1bf4958e207997
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:14:08 +0000 (22:14 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d
am:
5cd687505a -s ours
Change-Id: I08621df252756495257329a271cc6daed40605c5