OSDN Git Service
Hyundo Moon [Fri, 26 Jan 2018 04:38:38 +0000 (13:38 +0900)]
Add fromBundle/toBundle to PlaybackState2/PlaylistParams
Bug:
72531009
Test: Builds successfully
Change-Id: I71ba2d59793620f7d5757f21e6a075f75bbdef05
Andreas Gampe [Fri, 26 Jan 2018 06:14:15 +0000 (06:14 +0000)]
Merge "Watchdog: Add statsd to interesting processes" am:
8e8c9664ae am:
6b0c805328
am:
d68854161f
Change-Id: Ibe0eac8b462236f2b943cb08e95af69a0374cc8a
Andreas Gampe [Fri, 26 Jan 2018 06:05:51 +0000 (06:05 +0000)]
Merge "Watchdog: Add statsd to interesting processes" am:
8e8c9664ae
am:
6b0c805328
Change-Id: I7efcb364d6678ac80ef3e5e32794fbc5ffbe2a73
Andreas Gampe [Fri, 26 Jan 2018 05:57:39 +0000 (05:57 +0000)]
Merge "Watchdog: Add statsd to interesting processes"
am:
8e8c9664ae
Change-Id: I2dc9515e9205ced55bcddc2b0d83ac0105bc48f4
TreeHugger Robot [Fri, 26 Jan 2018 05:39:27 +0000 (05:39 +0000)]
Merge "Add TYPE_BUS to isValidAudioDeviceTypeOut"
Jaewan Kim [Fri, 26 Jan 2018 05:36:23 +0000 (05:36 +0000)]
Merge changes from topics "mediaplayerinterface", "mediasession2_executor"
* changes:
MediaSession2: Change MediaPlayerBase to MediaPlayerInterface
MediaSession2: Use Executor for callback handling
TreeHugger Robot [Fri, 26 Jan 2018 05:02:35 +0000 (05:02 +0000)]
Merge "Statsd and frameworks reference proto enums"
Jaewan Kim [Fri, 26 Jan 2018 04:00:10 +0000 (13:00 +0900)]
MediaSession2: Change MediaPlayerBase to MediaPlayerInterface
Test: Run all MediaComponents tests once
Bug:
72527150
Change-Id: Ifd384ea274ec949caa767210b07e558844552077
Jaewan Kim [Fri, 26 Jan 2018 02:47:45 +0000 (11:47 +0900)]
MediaSession2: Use Executor for callback handling
This also simplifies future work for adding more functions
Test: Run all MediaComponents test once
Change-Id: I37f1e205f95bcf506df5550c1e65a864e8a9028c
TreeHugger Robot [Fri, 26 Jan 2018 04:05:31 +0000 (04:05 +0000)]
Merge "Revert "Fix issue #
72116995: Add permission guarding Service#startForeground""
Treehugger Robot [Fri, 26 Jan 2018 03:52:14 +0000 (03:52 +0000)]
Merge "Watchdog: Add statsd to interesting processes"
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 03:44:10 +0000 (03:44 +0000)]
Merge "Add Voice / Data network specific reg states." am:
ffdbbc533c am:
e5932b56bc
am:
bf960e0fd8
Change-Id: I5b7198b261b70bfff233c904e4565f3000dc8c88
Winson Chung [Fri, 26 Jan 2018 03:39:33 +0000 (03:39 +0000)]
Merge "Allow setting split screen windowing mode without showing recents."
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 03:37:01 +0000 (03:37 +0000)]
Merge "Add Voice / Data network specific reg states." am:
ffdbbc533c
am:
e5932b56bc
Change-Id: I07c6aedf87c6800e9cce247b07aaf3d17162ea2b
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 03:29:53 +0000 (03:29 +0000)]
Merge "Add Voice / Data network specific reg states."
am:
ffdbbc533c
Change-Id: I28d44f657a60ec0f823524c3b5107bc3f4808bb1
Florina Muntenescu [Fri, 26 Jan 2018 03:19:11 +0000 (03:19 +0000)]
Merge "Making QuoteSpan more flexible."
Florina Muntenescu [Fri, 26 Jan 2018 03:18:46 +0000 (03:18 +0000)]
Merge "Update JavaDocs for Alignment, Clickable, Editable and MetricAffecting spans."
TreeHugger Robot [Fri, 26 Jan 2018 02:21:15 +0000 (02:21 +0000)]
Merge "Adding privacy tags to alarmmanager protos."
Tobias Thierer [Fri, 26 Jan 2018 02:17:04 +0000 (02:17 +0000)]
Merge "Deprecate android.util.Mutable*." am:
71a9e66d4a am:
708034e951
am:
6e6ce00b4c -s ours
Change-Id: Id81f5613daa50ece98a37a1595853546cc3c2434
Tobias Thierer [Fri, 26 Jan 2018 02:09:36 +0000 (02:09 +0000)]
Merge "Deprecate android.util.Mutable*." am:
71a9e66d4a
am:
708034e951
Change-Id: I903140fbb0a3635d7502943274377f99529b52a7
Tobias Thierer [Fri, 26 Jan 2018 02:03:33 +0000 (02:03 +0000)]
Merge "Deprecate android.util.Mutable*."
am:
71a9e66d4a
Change-Id: Ib82f53cac275d084851251c44b6860bfb282373d
TreeHugger Robot [Fri, 26 Jan 2018 01:50:07 +0000 (01:50 +0000)]
Merge "Statsd broadcasts when it is alive 2"
TreeHugger Robot [Fri, 26 Jan 2018 01:47:36 +0000 (01:47 +0000)]
Merge "Fix ModemActivityInfo should have more fields"
Android Build Merger (Role) [Fri, 26 Jan 2018 01:43:30 +0000 (01:43 +0000)]
Merge "Merge "Open Mobile API for frameworks/base" am:
183865f3e1 am:
ab8328c047 am:
2729909ab6"
Ruchi Kandoi [Fri, 26 Jan 2018 01:43:05 +0000 (01:43 +0000)]
Merge "Open Mobile API for frameworks/base" am:
183865f3e1 am:
ab8328c047
am:
2729909ab6
Change-Id: Iee488feed404819e487f3ae87b3e71f531fe69a4
Android Build Merger (Role) [Fri, 26 Jan 2018 01:38:40 +0000 (01:38 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51 am:
e15cb623db -s ours am:
8289005e10 -s ours am:
e158633931 -s ours am:
b2eb89daf5 -s ours"
TreeHugger Robot [Fri, 26 Jan 2018 01:38:28 +0000 (01:38 +0000)]
Merge "remove logic in saveConfiguration"
Android Build Merger (Role) [Fri, 26 Jan 2018 01:38:20 +0000 (01:38 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51 am:
e15cb623db -s ours am:
8289005e10 -s ours am:
e158633931 -s ours
am:
b2eb89daf5 -s ours
Change-Id: Iea7ed535f395da6ce821131e7b846b029b220526
Android Build Merger (Role) [Fri, 26 Jan 2018 01:36:54 +0000 (01:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399 am:
7e0d93a69b -s ours am:
dba446b7a3 -s ours am:
fd1f0742b7 -s ours
am:
4032a0d285 -s ours
Change-Id: I80ec7f81a429e037f36e46cea7d4ae9a8f005af2
Android Build Merger (Role) [Fri, 26 Jan 2018 01:35:40 +0000 (01:35 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef am:
0e2501decd -s ours am:
f03288d9f2 -s ours am:
81666bea7f -s ours
am:
3dbd23e4fe -s ours
Change-Id: I2e819bd251c01a46d381b55318d1b0daaa01c878
Android Build Merger (Role) [Fri, 26 Jan 2018 01:34:00 +0000 (01:34 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev am:
a22445abae -s ours" into oc-dev am:
dbdfba9546 -s ours am:
dbbffc9bd6 -s ours am:
3a09b4e748 -s ours
am:
508e3d6db7 -s ours
Change-Id: If78aaa1ad90fc63bdaaad641d352951fc5de9f54
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"
Ruchi Kandoi [Fri, 26 Jan 2018 01:18:49 +0000 (01:18 +0000)]
Merge "Open Mobile API for frameworks/base" am:
183865f3e1
am:
ab8328c047
Change-Id: I55279ea7f83de285df54f7a01257230268c253f0
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
Ruchi Kandoi [Fri, 26 Jan 2018 01:13:45 +0000 (01:13 +0000)]
Merge "Open Mobile API for frameworks/base"
am:
183865f3e1
Change-Id: I96804d1c8e75a6d9d1475438a1753f54e07d0b8a
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"
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 00:41:27 +0000 (00:41 +0000)]
Merge "Add Voice / Data network specific reg states."
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..."
Treehugger Robot [Fri, 26 Jan 2018 00:28:52 +0000 (00:28 +0000)]
Merge "Deprecate android.util.Mutable*."
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."
Kweku Adams [Thu, 25 Jan 2018 23:49:34 +0000 (15:49 -0800)]
Adding privacy tags to alarmmanager protos.
Bug:
72393215
Test: Flash device and check incident.proto output
Change-Id: Ibd28a52621ce3c8e1ba447356522772aa04baa3b
Bookatz [Thu, 25 Jan 2018 23:49:26 +0000 (15:49 -0800)]
Statsd broadcasts when it is alive 2
Continuation of ag/
3508513.
Test: manually made sure the broadcast was sent
Bug:
70389379
Bug:
72450885
Change-Id: Ib49c5e967d3c8e31ef127347afa450ce8c5e170b
Bookatz [Fri, 12 Jan 2018 19:47:03 +0000 (11:47 -0800)]
Statsd and frameworks reference proto enums
For frameworks constants that don't have intrinsic meaning (i.e. their actual
value and order don't matter), so that it is unlikely that their values
will be changed:
This cl introduces proto enums representing some constants found in
the Android codebase, and connects the two.
By using the Proto enum as the source-of-truth, it means that Java and
proto can be kept in sync. Otherwise, when the Java frameworks code
changes, it silently breaks the protos from working properly, since the enums
are wrong. By having the Java code reference the proto enums, it ensures
that everything is in sync. The values of the constants are unchanged.
But future changes to these constants will need to be done in the proto
file, which the Java file merely references.
The protos are necessary for incidentd and statsd and, in the future,
possibly dumpsys. In this way, the logging mechanism is much less likely
to get broken when new constants are added, and we can be ensured that
the logging accurately reflects the underlying codebase.
Bug:
69478930
Test: cts-tradefed run cts-dev -m CtsStatsdHostTestCases
Test: cts-tradefed run cts-dev -m CtsIncidentHostTestCases
Change-Id: If79032c34b2799db1e3e70cb47b1312fd72092b9
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"
Android Build Merger (Role) [Thu, 25 Jan 2018 23:34:38 +0000 (23:34 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51 am:
e15cb623db -s ours am:
8289005e10 -s ours
am:
e158633931 -s ours
Change-Id: Ifc1f97d02ebcb063626c7a2b731c1be16916064f
Android Build Merger (Role) [Thu, 25 Jan 2018 23:33:35 +0000 (23:33 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399 am:
7e0d93a69b -s ours am:
dba446b7a3 -s ours
am:
fd1f0742b7 -s ours
Change-Id: I37e9454080f4ed4766ccfd69594106ee48a64638
Android Build Merger (Role) [Thu, 25 Jan 2018 23:32:22 +0000 (23:32 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef am:
0e2501decd -s ours am:
f03288d9f2 -s ours
am:
81666bea7f -s ours
Change-Id: I0a46b477cb406d54a404faa37c121fc8f7de0e1d
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:31:12 +0000 (23:31 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev am:
a22445abae -s ours" into oc-dev am:
dbdfba9546 -s ours am:
dbbffc9bd6 -s ours
am:
3a09b4e748 -s ours
Change-Id: I709ad494550215037ca532d902c2935c7f22efb1
Ruchi Kandoi [Thu, 25 Jan 2018 23:30:50 +0000 (23:30 +0000)]
Merge "Open Mobile API for frameworks/base"
Chenjie Yu [Thu, 25 Jan 2018 23:30:07 +0000 (15:30 -0800)]
Fix ModemActivityInfo should have more fields
Test: cts test
Change-Id: I6f03eae0f87265fe6c958575de1b1cebbc873373
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
xshu [Sat, 20 Jan 2018 02:27:42 +0000 (18:27 -0800)]
remove logic in saveConfiguration
The API is deprecated and now returns true.
Bug:
72074967
Test: compile, run ./frameworks/base/wifi/tests/runtests.sh
Change-Id: I83ce6cc8898f7df9fc920675fa669d03fa15f36e
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
OSDN Git Service
