OSDN Git Service
Makoto Onuki [Fri, 26 Jan 2018 16:43:08 +0000 (16:43 +0000)]
Merge "Do not throttle EXEMPT apps on battery saver"
TreeHugger Robot [Fri, 26 Jan 2018 16:40:11 +0000 (16:40 +0000)]
Merge "Adding privacy tags to Settings proto."
Insun Kang [Fri, 26 Jan 2018 16:31:31 +0000 (16:31 +0000)]
Merge "Revert "MediaSession2 API set for audio focus handling""
Insun Kang [Fri, 26 Jan 2018 16:28:40 +0000 (16:28 +0000)]
Revert "MediaSession2 API set for audio focus handling"
This reverts commit
b4689ed97f85f92d466702b8b81956c189606ce3.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I76f1318941466c10fe08a49a87e4d529aa96391a
TreeHugger Robot [Fri, 26 Jan 2018 16:14:04 +0000 (16:14 +0000)]
Merge "Remove @removed trySetQuietModeEnabled"
Tony Mak [Thu, 25 Jan 2018 11:18:13 +0000 (11:18 +0000)]
Remove @removed trySetQuietModeEnabled
Context:
Updated the API according to API council feedback. Marked it as
@Removed and keep it for a while for Launcher. But now Launcher
prebuilt is updated, we are safe to remove it.
Test: Build
BUG:
71818127
Change-Id: I33fec12addf7031bfbcd86bce9e636c31d0ea4d3
TreeHugger Robot [Fri, 26 Jan 2018 16:04:29 +0000 (16:04 +0000)]
Merge "QS dnd icon is always the same dnd icon"
Jaewan Kim [Fri, 26 Jan 2018 15:18:10 +0000 (15:18 +0000)]
Merge "MediaSession2 API set for audio focus handling"
Jaewan Kim [Fri, 26 Jan 2018 15:09:31 +0000 (15:09 +0000)]
Merge "MediaSession2: Add playlist parameter supports"
Hyundo Moon [Fri, 26 Jan 2018 14:48:11 +0000 (14:48 +0000)]
Merge "MediaSession2: Complete transport control commands"
Hyundo Moon [Fri, 26 Jan 2018 11:33:57 +0000 (20:33 +0900)]
MediaSession2: Add playlist parameter supports
This CL adds following APIs:
- MediaPlayerInterface.set/getPlaylistParams()
- MediaSession2.set/getPlaylistParams()
- MediaController2.setPlaylistParams()
- ControllerCallback.onPlaylistParamsChanged()
Bug:
72537520
Test: Passed MediaSession2Test
Change-Id: I84ea00ee0876725af1c0e01ad50da15fdb222418
TreeHugger Robot [Fri, 26 Jan 2018 14:36:40 +0000 (14:36 +0000)]
Merge "Remove QSPanel bounds after expansion animation."
Tobias Thierer [Fri, 26 Jan 2018 14:34:03 +0000 (14:34 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." am:
9f82b6bab5 am:
c4905215cb
am:
6160f1dbe1 -s ours
Change-Id: Iad86f663488ef80626c216b07bc6e9f71ae2345f
Insun Kang [Fri, 26 Jan 2018 12:24:19 +0000 (21:24 +0900)]
MediaSession2 API set for audio focus handling
MediaPlayerInterface has:
- setAudioAttributes
- getAudioAttributes
MediaSession2 has:
- setAudioFocusRequest
Test: build
Bug:
72529899
Change-Id: I64b0238791f25bfd07138686166521a76bc36230
Tobias Thierer [Fri, 26 Jan 2018 14:25:41 +0000 (14:25 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." am:
9f82b6bab5
am:
c4905215cb
Change-Id: I064799b5db75c15bff441e9e35a32f5e89f56c35
Tobias Thierer [Fri, 26 Jan 2018 14:18:44 +0000 (14:18 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
am:
9f82b6bab5
Change-Id: I8cc8b609a02e5059bcda111a416d47d7272c4e3b
David Srbecky [Fri, 26 Jan 2018 14:13:45 +0000 (14:13 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART" am:
418a96457c am:
637814eebf
am:
8d4f8127e1
Change-Id: Ia4869cc2012ec7e7409c6ebb42a2d8291ed08bbf
David Srbecky [Fri, 26 Jan 2018 14:05:12 +0000 (14:05 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART" am:
418a96457c
am:
637814eebf
Change-Id: I0ecf4d2d1922cfe9948936ef3e494f0a71e6c2f5
David Srbecky [Fri, 26 Jan 2018 13:59:35 +0000 (13:59 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"
am:
418a96457c
Change-Id: Ife46a3f6e1c5ad33e7830df0c74a6cbd674f8032
Insun Kang [Fri, 26 Jan 2018 13:06:03 +0000 (13:06 +0000)]
Merge "VideoView2/MediaControlView2: Remove overriden onKeyDown/dispatchKeyEvent"
Tobias Thierer [Fri, 26 Jan 2018 13:05:06 +0000 (13:05 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
David Srbecky [Fri, 26 Jan 2018 12:37:48 +0000 (12:37 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"
Leon Scroggins [Fri, 26 Jan 2018 11:16:04 +0000 (11:16 +0000)]
Merge "Expose AnimatedImageDrawable"
Insun Kang [Fri, 26 Jan 2018 10:30:51 +0000 (19:30 +0900)]
VideoView2/MediaControlView2: Remove overriden onKeyDown/dispatchKeyEvent
Test: build
Change-Id: I4f3a397001e771eac1d1f0208d4e2f262c76b44c
Hyundo Moon [Fri, 26 Jan 2018 09:44:47 +0000 (09:44 +0000)]
Merge "Add fromBundle/toBundle to PlaybackState2/PlaylistParams"
Hyundo Moon [Fri, 26 Jan 2018 09:42:02 +0000 (09:42 +0000)]
Merge "VideoView2: Add custom actions API"
Hyundo Moon [Fri, 26 Jan 2018 06:50:18 +0000 (15:50 +0900)]
MediaSession2: Complete transport control commands
Bug:
72531854
Test: Builds successfully
Change-Id: I1d52580bd9c95e08561905aba19205caee649de1
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
Adam Lesinski [Fri, 26 Jan 2018 06:55:27 +0000 (06:55 +0000)]
Merge changes from topic "revert-assetmanager2"
* changes:
Revert "Replace AssetManager with AssetManager2 implementation"
Revert "libandroidfw: Add ApplyStyle and SetConfiguration benchmark"
Revert "libandroidfw: Improve performance of AssetManager2"
Insun Kang [Fri, 26 Jan 2018 06:55:13 +0000 (06:55 +0000)]
Merge "VideoView2: Apply API review comment"
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""
Hyundo Moon [Thu, 25 Jan 2018 08:34:05 +0000 (17:34 +0900)]
VideoView2: Add custom actions API
Test: Using VideoViewTest application
Change-Id: I941bf0f9605918b0e0f9e4684327eee9ffe24e11
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."
Insun Kang [Fri, 26 Jan 2018 02:06:57 +0000 (11:06 +0900)]
VideoView2: Apply API review comment
- Lint error: setVideoURI --> setVideoUri
- Adds 'View' parameter to the listener methods
- Adds missing documents for constants
- Removes getAudioSessionId()
- Typos
Test: build
Change-Id: I217c7608a8b9fed4111d0c928a270784307bf378
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
Adam Lesinski [Thu, 25 Jan 2018 23:38:58 +0000 (15:38 -0800)]
Revert "Replace AssetManager with AssetManager2 implementation"
This reverts commit
dcb3c6559b09ec89771858ec27a787027da9af50.
Bug:
72511998
Change-Id: I665966ca109f66f85d8665db388c71ea2303c3b8
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
Adam Lesinski [Thu, 25 Jan 2018 23:38:50 +0000 (15:38 -0800)]
Revert "libandroidfw: Add ApplyStyle and SetConfiguration benchmark"
This reverts commit
d9c809c480e22ccced6762268efaa30bb9a6e491.
Bug:
72511998
Change-Id: I3be2374e3662fc8397c00f1df1bce6de5f5a4549
Adam Lesinski [Thu, 25 Jan 2018 23:38:38 +0000 (15:38 -0800)]
Revert "libandroidfw: Improve performance of AssetManager2"
This reverts commit
64ee69d0f1f412edee2eb7a0c846deebbfa37ef9.
Bug:
72511998
Change-Id: Iab3ce449e60ec2451d391217543528d312089080
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..."
OSDN Git Service
