OSDN Git Service
Hakan Seyalioglu [Thu, 2 Feb 2017 23:25:21 +0000 (23:25 +0000)]
DO NOT MERGE - Check exported status in chooser am:
e3286c3145
am:
531def93f0 -s ours
Change-Id: I6ab080f26174b48c4efba25395869e4dafedc9c6
Peter Qiu [Thu, 2 Feb 2017 23:24:11 +0000 (23:24 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am:
e724f82b3d am:
281fae21f8 am:
eeeb10c645
am:
637c407d78 -s ours
Change-Id: Ia36702e0d637666344b2adbf813d348404b410c7
Manu Cornet [Thu, 2 Feb 2017 23:22:56 +0000 (23:22 +0000)]
Merge "2D Recents: Less drastic scale reduction for dismiss animation" into nyc-mr2-dev am:
c01308a03c
am:
ce4606a05f
Change-Id: I81be1f4cf1056fbcfbef49556906c770e7b41840
Manu Cornet [Thu, 2 Feb 2017 23:21:56 +0000 (23:21 +0000)]
2D Recents: Less drastic scale reduction for dismiss animation am:
8ea36af22b
am:
69f9c6073d
Change-Id: I60cc6ab90e224c82524a36bc2d5123d0cda95fa0
Suprabh Shukla [Thu, 2 Feb 2017 23:20:59 +0000 (23:20 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60 am:
029364c505 am:
2f1b2d82ca am:
ac8f44e387 am:
674cefc5f5
am:
fd8ccd934a -s ours
Change-Id: Ic0d5b6c9a31227b5650fa25244fc3a2a553b1359
Manu Cornet [Thu, 2 Feb 2017 23:20:06 +0000 (23:20 +0000)]
Merge "2D Recents: Fix issues with thumbnail scaling transitions" into nyc-mr2-dev am:
f41a8c5a3d
am:
10b7963547
Change-Id: Ie00ba28ca5ac20a579231892d37abd1f3580ecab
Manu Cornet [Thu, 2 Feb 2017 23:19:05 +0000 (23:19 +0000)]
2D Recents: Fix issues with thumbnail scaling transitions am:
57b6149f8b
am:
6f5bb1f340
Change-Id: I0556939ca9c94965865ac050a98981a347f6d0aa
Makoto Onuki [Thu, 2 Feb 2017 23:18:05 +0000 (23:18 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
2317451acc am:
01f971dcdc am:
963cba5b5b am:
f1e276384d -s ours am:
3d45f12cad -s ours
am:
40c83c5b0f -s ours
Change-Id: I4425ab8e2b6a7c51d1da2f7da52ae0e498648f9c
Philip P. Moltmann [Thu, 2 Feb 2017 23:16:47 +0000 (23:16 +0000)]
Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev am:
65924030d6
am:
962db24548 -s ours
Change-Id: I5542b89150066d5b10bac38fd05a42237b60bbd5
Philip P. Moltmann [Thu, 2 Feb 2017 23:15:53 +0000 (23:15 +0000)]
[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms am:
2fc44947dd
am:
416a36a83b -s ours
Change-Id: Ic800b08f1aca058084538b0e862c2255ab96fdb0
Paul Lawrence [Thu, 2 Feb 2017 23:14:22 +0000 (23:14 +0000)]
Merge "Install seccomp into zygote not init" am:
ba9bbd8517 am:
dcf63748fc am:
5a389e7e44
am:
299227693c
Change-Id: Iaf077a1adfc25c5b3eff91058f35f58155438fbe
Paul Lawrence [Thu, 2 Feb 2017 23:08:50 +0000 (23:08 +0000)]
Merge "resolve merge conflicts of
fde0a41065eb to master"
TreeHugger Robot [Thu, 2 Feb 2017 22:54:41 +0000 (22:54 +0000)]
Merge "TIF: add COLUMN_SYSTEM_APPROVED in Channels"
TreeHugger Robot [Thu, 2 Feb 2017 22:53:56 +0000 (22:53 +0000)]
Merge "TIF: change the column names to be consistent with other fields"
TreeHugger Robot [Thu, 2 Feb 2017 21:57:25 +0000 (21:57 +0000)]
Merge "Enabling USB Debugging Connected notification on Android TV"
Adam Lesinski [Thu, 2 Feb 2017 21:48:12 +0000 (21:48 +0000)]
Merge "AssetManager2: Add other support methods"
TreeHugger Robot [Thu, 2 Feb 2017 21:40:16 +0000 (21:40 +0000)]
Merge "Update the drag to dismiss UI to be closer to design"
Paul Lawrence [Thu, 2 Feb 2017 21:25:47 +0000 (13:25 -0800)]
resolve merge conflicts of
fde0a41065eb to master
Test: Make sure builds, boots
Change-Id: Idf86dc5d888c09e8a65ada51fc2f32aae6d5570d
TreeHugger Robot [Thu, 2 Feb 2017 21:21:11 +0000 (21:21 +0000)]
Merge "Add comment to netstats proto"
Alex Deymo [Thu, 2 Feb 2017 21:11:51 +0000 (21:11 +0000)]
Merge "Compile native network functionis into libandroid_net." am:
b1cb60d920 am:
5292c727b7 am:
b92ba328e4
am:
ff727728b5
Change-Id: Iab936db453c1c2dc28cdb19bfa9ed6b10471c54d
Jason Monk [Thu, 2 Feb 2017 21:09:26 +0000 (21:09 +0000)]
Merge "Move recents CommandQueue callbacks to recents"
Alex Deymo [Thu, 2 Feb 2017 21:08:08 +0000 (21:08 +0000)]
Compile native network functionis into libandroid_net. am:
f3b7411060 am:
af657d14fc am:
74a410ec81
am:
2e61c0eea3
Change-Id: I7a1d3c40bcf76a3e6eabb3eddff159a53af0c5c1
Hugo Benichi [Thu, 2 Feb 2017 21:05:11 +0000 (21:05 +0000)]
Merge "Revert "Merge "Define Network notification proto constants." am:
05550d9ed8 am:
6236f49f0e am:
7b39349792"" into nyc-mr2-dev-plus-aosp
am:
c23ff1d477
Change-Id: I9161929f3a7308be4764dbb50e443a46fdc4960c
Hugo Benichi [Thu, 2 Feb 2017 21:05:00 +0000 (21:05 +0000)]
Revert "Merge "Define Network notification proto constants." am:
05550d9ed8 am:
6236f49f0e am:
7b39349792"
am:
6776f79012 -s ours
Change-Id: I80ce623da40db32faa3bef88ee2612a1a163e777
Abodunrinwa Toki [Thu, 2 Feb 2017 11:07:05 +0000 (11:07 +0000)]
Fix TextClassifier.getTextClassificationResult()
Gracefully handles situations where a default app cannot be found
to handle the intent.
1. If we can not find any app to handle the intent,
do not include an "assist" menu item entry to fire the intent.
Also, do not linkify the entry.
2. If we do not have a default app to handle the intent,
show a generic title for apps that will handle the intent
and do not include an icon.
In the ideal case where we find a default app to include the intent,
show the app's (preferably activity's) title and icon.
Test: Manually tested. There's an AI to write more automated tests.
Bug:
34777322
Bug:
34927631
Change-Id: Ia94efbbdda3da8f181fac9228cd2d3a76cb727d3
Geoffrey Pitsch [Thu, 2 Feb 2017 20:25:43 +0000 (20:25 +0000)]
Merge "SystemUI uses Builder API with NotificationChannel"
Hakan Seyalioglu [Thu, 2 Feb 2017 20:16:23 +0000 (20:16 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
e3286c3145
Change-Id: I55a6e9ed942a4542dcdf497e297654b666d88fb0
TreeHugger Robot [Thu, 2 Feb 2017 20:05:42 +0000 (20:05 +0000)]
Merge "Batterystats commands to simulate screen on/off"
TreeHugger Robot [Thu, 2 Feb 2017 20:05:17 +0000 (20:05 +0000)]
Merge "AudioService: query a11y manager at init for a11y volume active"
TreeHugger Robot [Thu, 2 Feb 2017 20:04:57 +0000 (20:04 +0000)]
Merge "Fixing crash when task is already parent of activity."
Erik Kline [Thu, 2 Feb 2017 20:03:51 +0000 (20:03 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am:
c313123afe am:
6f32aa0259 am:
7196e935a8
am:
c700509ade
Change-Id: I15fe6fe4c9aec3d244b46516c2992ded33337a9f
Hugo Benichi [Thu, 2 Feb 2017 20:02:40 +0000 (20:02 +0000)]
Merge "Define Network notification proto constants." am:
05550d9ed8 am:
6236f49f0e am:
7b39349792
am:
814a59ba82 -s ours
Change-Id: Iafa147a12cfa9ba559458c72ab47553c847cd115
TreeHugger Robot [Thu, 2 Feb 2017 19:47:24 +0000 (19:47 +0000)]
Merge "Alert Windows behavioral changes"
Peter Qiu [Thu, 2 Feb 2017 19:46:51 +0000 (19:46 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am:
e724f82b3d am:
281fae21f8
am:
eeeb10c645
Change-Id: Ib218b76e03bb6a6082113d27ec514b03f2348b6e
Winson Chung [Thu, 2 Feb 2017 18:06:09 +0000 (10:06 -0800)]
Fixing crash when task is already parent of activity.
- When launching an activity into a task, it's parent is already set
which can cause the reparent call to crash. Instead, just move the
activity to the top.
Bug:
34933399
Test: Launch an app that doesn't support multiwindow, and engage split
screen, or launch a PiP activity and tap to show the menu
Change-Id: Iaa36003e88f4021f2483dedc71802023369d6558
Peter Qiu [Thu, 2 Feb 2017 19:42:51 +0000 (19:42 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am:
e724f82b3d
am:
281fae21f8
Change-Id: I1baeb7afdff6fbc399ab16ef7aa266506ef7aacb
TreeHugger Robot [Thu, 2 Feb 2017 19:39:42 +0000 (19:39 +0000)]
Merge "Add hidden KeyProtection API to specify SID"
Peter Qiu [Thu, 2 Feb 2017 19:37:50 +0000 (19:37 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"
am:
e724f82b3d
Change-Id: I250566dbd8dff8c50692e47b1b3e9bb7568bb8b4
Manu Cornet [Thu, 2 Feb 2017 19:30:29 +0000 (19:30 +0000)]
Merge "2D Recents: Less drastic scale reduction for dismiss animation" into nyc-mr2-dev
am:
c01308a03c
Change-Id: Ie25f4dffc768f99f99de72f6ac56692dd4c2fc82
Manu Cornet [Thu, 2 Feb 2017 19:30:21 +0000 (19:30 +0000)]
2D Recents: Less drastic scale reduction for dismiss animation
am:
8ea36af22b
Change-Id: Ie90263b3eff6ecc7b469fe7c6fa028c2ff1afc62
Treehugger Robot [Thu, 2 Feb 2017 19:29:51 +0000 (19:29 +0000)]
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"
Suprabh Shukla [Thu, 2 Feb 2017 19:29:02 +0000 (19:29 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
4ffe72dcc8 am:
ab8d3febd3 am:
2e6bdbeaab am:
588411fc7c -s ours am:
773f85ec60 am:
029364c505 am:
2f1b2d82ca am:
ac8f44e387
am:
674cefc5f5
Change-Id: Ib8471fb2dd4f3939fb603fb324d0955f8242ce5f
Manu Cornet [Thu, 2 Feb 2017 19:26:58 +0000 (19:26 +0000)]
Merge "2D Recents: Fix issues with thumbnail scaling transitions" into nyc-mr2-dev
am:
f41a8c5a3d
Change-Id: I2aa5e9e671d6c206c87792d2c3759c4e797f4ee2
Manu Cornet [Thu, 2 Feb 2017 19:26:43 +0000 (19:26 +0000)]
2D Recents: Fix issues with thumbnail scaling transitions
am:
57b6149f8b
Change-Id: Iacd79a63699736c9b8fb7794d45bc8891c57b513
Makoto Onuki [Thu, 2 Feb 2017 19:23:21 +0000 (19:23 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
2317451acc am:
01f971dcdc am:
963cba5b5b am:
f1e276384d -s ours
am:
3d45f12cad -s ours
Change-Id: I45d90081978d31863b6b29701fbf1cd051699053
Philip P. Moltmann [Thu, 2 Feb 2017 19:21:45 +0000 (19:21 +0000)]
Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev
am:
65924030d6
Change-Id: Ib41328d4c9759d521cf2b27327ca0bc0baa5591a
Philip P. Moltmann [Thu, 2 Feb 2017 19:21:40 +0000 (19:21 +0000)]
[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms
am:
2fc44947dd
Change-Id: Ie0bb1c0c23928318cbaf3dc22ca0aa6761bbfa75
TreeHugger Robot [Thu, 2 Feb 2017 19:13:41 +0000 (19:13 +0000)]
Merge "TextClassificationManager: Make certain methods thread-safe"
Jason Monk [Thu, 2 Feb 2017 19:11:20 +0000 (14:11 -0500)]
Move recents CommandQueue callbacks to recents
This will make it a more common and less broken place for both
handset and TV.
Fixes:
34813216
Test: make and click on recents button.
Change-Id: I2fd9c3103e2be28a19497719ac5763c064beeed1
Mady Mellor [Thu, 26 Jan 2017 18:43:16 +0000 (10:43 -0800)]
Update the drag to dismiss UI to be closer to design
Rather than a circular target for drag to dismiss, there is text / icon
as well as a gradient. As the PIP approaches the text / icon they grow
in size. If the PIP is released overtop of the text / icon, it is
dismissed.
Test: Using PIP test app, have a PIP, drag it to dismiss target area.
Change-Id: I339ad14e144dfd61f0e990ba4d2559642a47b141
Chad Brubaker [Thu, 2 Feb 2017 19:07:56 +0000 (19:07 +0000)]
Merge "Allow ephemeral apps to reach any CATEGORY_BROWSABLE"
Makoto Onuki [Thu, 2 Feb 2017 18:54:03 +0000 (10:54 -0800)]
Add comment to netstats proto
Test: Build only
Change-Id: I29d7dbda0f0a8b393f250a9106bcb696e0c2431a
Paul Lawrence [Thu, 2 Feb 2017 18:38:09 +0000 (18:38 +0000)]
Merge "Install seccomp into zygote not init" am:
ba9bbd8517 am:
dcf63748fc
am:
5a389e7e44
Change-Id: Ibe0c3f397e820609401a53d18177691181ab7f49
Paul Lawrence [Thu, 2 Feb 2017 18:37:22 +0000 (18:37 +0000)]
Install seccomp into zygote not init am:
ef85477470 am:
521d25294b
am:
e6e8c7a1dd
Change-Id: I97d2843a2c2940b558f216cf550891a80963be54
Alex Deymo [Thu, 2 Feb 2017 18:33:57 +0000 (18:33 +0000)]
Merge "Compile native network functionis into libandroid_net." am:
b1cb60d920 am:
5292c727b7
am:
b92ba328e4
Change-Id: I1ef1f2caebed6e7eab3a68981886a0bdd758c0e9
Alex Deymo [Thu, 2 Feb 2017 18:32:23 +0000 (18:32 +0000)]
Compile native network functionis into libandroid_net. am:
f3b7411060 am:
af657d14fc
am:
74a410ec81
Change-Id: I0072d540b707d217b28bc6f1ba0a6947bb812639
Paul Lawrence [Thu, 2 Feb 2017 18:31:42 +0000 (18:31 +0000)]
Merge "Install seccomp into zygote not init" am:
ba9bbd8517
am:
dcf63748fc
Change-Id: I7cb6ff86a8466aa0ca45691b2d169b4b7467bd9a
Paul Lawrence [Thu, 2 Feb 2017 18:30:49 +0000 (18:30 +0000)]
Install seccomp into zygote not init am:
ef85477470
am:
521d25294b
Change-Id: I7c2c84a5bd67490070777d11d7f930c5dba90cbe
Diego Perez [Thu, 2 Feb 2017 18:29:35 +0000 (18:29 +0000)]
Merge "Update native delegates"
Hakan Seyalioglu [Mon, 30 Jan 2017 19:14:48 +0000 (11:14 -0800)]
DO NOT MERGE - Check exported status in chooser
Relevant change in master is ag/
1844170
bug:
34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
Alex Deymo [Thu, 2 Feb 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Compile native network functionis into libandroid_net." am:
b1cb60d920
am:
5292c727b7
Change-Id: I81f4a2ecf25fe324afa78b5dfb9fd4f7d264e1c6
Dmitri Plotnikov [Wed, 1 Feb 2017 01:48:43 +0000 (17:48 -0800)]
Enabling USB Debugging Connected notification on Android TV
Bug:
34859109
Test: verified that the notification showed up in LeanbackLauncher
Change-Id: I2d5798e994df74b7d3211ccf7f22a6aff44bd681
Alex Deymo [Thu, 2 Feb 2017 18:23:21 +0000 (18:23 +0000)]
Compile native network functionis into libandroid_net. am:
f3b7411060
am:
af657d14fc
Change-Id: Ic8e457c36a35afd296ae97704e0703dbae781d40
Paul Lawrence [Thu, 2 Feb 2017 18:18:15 +0000 (18:18 +0000)]
Merge "Install seccomp into zygote not init"
am:
ba9bbd8517
Change-Id: I989c34f133e37b68dbd387b263dc5191ac8d6215
Paul Lawrence [Thu, 2 Feb 2017 18:18:08 +0000 (18:18 +0000)]
Install seccomp into zygote not init
am:
ef85477470
Change-Id: I22745a759cc4f9797cb3c806bbdd4d69d6cccdcb
Alex Deymo [Thu, 2 Feb 2017 18:16:45 +0000 (18:16 +0000)]
Merge "Compile native network functionis into libandroid_net."
am:
b1cb60d920
Change-Id: Ia0cf31b962cd26b9c7d1d4917b3523e7f3fbfa2c
Alex Deymo [Thu, 2 Feb 2017 18:11:40 +0000 (18:11 +0000)]
Compile native network functionis into libandroid_net.
am:
f3b7411060
Change-Id: Ib01eaf11caacb35ba905012f06d0777d237dd2d1
Anthony Chen [Thu, 2 Feb 2017 18:09:37 +0000 (18:09 +0000)]
Merge "Refactor notification to allow for overlay by Android Auto."
Paul Lawrence [Thu, 2 Feb 2017 18:09:17 +0000 (18:09 +0000)]
Merge "Install seccomp into zygote not init"
TreeHugger Robot [Thu, 2 Feb 2017 18:08:23 +0000 (18:08 +0000)]
Merge "Fix leaks in sysui"
TreeHugger Robot [Thu, 2 Feb 2017 18:07:51 +0000 (18:07 +0000)]
Merge "port status bar logs to Tron V2"
Hangyu Kuang [Thu, 2 Feb 2017 18:07:17 +0000 (18:07 +0000)]
Merge "media: Add 3gpp output format to MediaMuxer."
Treehugger Robot [Thu, 2 Feb 2017 17:59:52 +0000 (17:59 +0000)]
Merge "Compile native network functionis into libandroid_net."
Rubin Xu [Mon, 30 Jan 2017 23:39:12 +0000 (23:39 +0000)]
Add hidden KeyProtection API to specify SID
Allows the caller to specify which SID the given key
should be bound to, overriding the default rule of
binding to the current root/fingerprint SID.
This is a prerequsite for introducing synthetic password
based authentication flow.
Test: cts-tradefed run cts -m CtsKeystoreTestCases
Bug:
33126414
Change-Id: Ide03c0f4fd33ecca7a169ea763c3d4d0b173d1dd
Paul Lawrence [Tue, 31 Jan 2017 17:54:31 +0000 (09:54 -0800)]
Install seccomp into zygote not init
Bug:
34710876
Test: Boots, correct size filter installed, blocks unallowed calls
Change-Id: I3e66e8724ace37f7d30451b98a5e574766252ea0
Abodunrinwa Toki [Thu, 2 Feb 2017 14:11:34 +0000 (14:11 +0000)]
TextClassificationManager: Make certain methods thread-safe
1. getDefaultTextClassifier()
2. getLanguageDetector()
Test: CtsWidgetTestCases passes
Change-Id: Ie0cb866cdefea2839efb38a1113e434a3e8159b0
TreeHugger Robot [Thu, 2 Feb 2017 16:58:53 +0000 (16:58 +0000)]
Merge "Addition separation of adding vs. reparenting activity"
Diego Perez [Thu, 2 Feb 2017 16:08:41 +0000 (16:08 +0000)]
Update native delegates
After changes
9ff994d98846,
6e3658a63843 and
18e9f9f37783
Test: Existing layoutlib tests
Change-Id: I8e39f26ccb0a8cb73a724f16734e66cf95c08656
Erik Kline [Thu, 2 Feb 2017 16:52:43 +0000 (16:52 +0000)]
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am:
603eefd5d5 am:
180a3d07a8 am:
d85f448274
am:
2ebea21074
Change-Id: I2e0ab82edd8997188c8c16dce6373ccb19657e3d
Wale Ogunwale [Thu, 26 Jan 2017 22:14:08 +0000 (14:14 -0800)]
Alert Windows behavioral changes
- Introduced TYPE_APPLICATION_OVERLAY window type. Can be used by apps
to display windows on top of other app windows, but below critical
system windows.
- Deprecate alert window types TYPE_PHONE, TYPE_SYSTEM_ALERT,
TYPE_SYSTEM_OVERLAY, TYPE_PRIORITY_PHONE, and TYPE_SYSTEM_ERROR.
Apps should now use TYPE_APP_OVERLAY for this.
- Apps targetting O or greater are not allowed to add the old alert
window types.
Apps targetting less than O can still add the old types.
Apps with permission INTERNAL_SYSTEM_WINDOW (system signature apps) can
still add the old types.
- Z-order old alert windows types below TYPE_APPLICATION_OVERLAY if
they are added by an app without the INTERNAL_SYSTEM_WINDOW permission.
Test: android.server.cts.AlertWindowsTests
Bug:
33256752
Change-Id: I12170955a7a333151d3387c169b51c53c32164fc
Jerome Gaillard [Thu, 2 Feb 2017 16:12:22 +0000 (16:12 +0000)]
Merge changes Ic8254f0f,I1f285c3b
* changes:
Ignore justified in layoutlib for the moment
Update Canvas_Delegate after Change I3edc963a
Geoffrey Pitsch [Tue, 31 Jan 2017 21:38:11 +0000 (16:38 -0500)]
SystemUI uses Builder API with NotificationChannel
Some changes to channels based on UX feedback.
Test: runtest systemui
Change-Id: I1b2f661ba145d6926035f992231dc3c2f8cbf844
TreeHugger Robot [Thu, 2 Feb 2017 16:07:37 +0000 (16:07 +0000)]
Merge "Framework: Preloaded-classes tuning"
Jason Monk [Thu, 2 Feb 2017 00:26:30 +0000 (19:26 -0500)]
Fix leaks in sysui
Add support for testing for PluginManager and TunerService leaks
and add tests for the known leaks and fix them. Also port PluginManager
and TunerService to Dependency to make them easier to handle in
tests.
Test: runtest systemui
Change-Id: I5642539ee24dd72f802905106decd0c87b41b4eb
Fixes:
34846972
Manu Cornet [Thu, 2 Feb 2017 15:51:53 +0000 (15:51 +0000)]
Merge "2D Recents: Less drastic scale reduction for dismiss animation" into nyc-mr2-dev
Wale Ogunwale [Wed, 1 Feb 2017 23:33:08 +0000 (15:33 -0800)]
Addition separation of adding vs. reparenting activity
- Removed method ActivityRecord.setTask which did only half of what
is needed when adding a task and also only did half of what is needed
for reparenting. Previous callers now need to call either
ActivityRecord.reparent() to reparent and activity or
TaskRecord.addActivityAtIndex() to add an activity to a task.
- Fixed some NPE that resulted from the above change.
Test: adb shell am instrument -w -e class
com.google.android.setupwizard.tests.activity.SetupWizardExitActivityTest
com.google.android.setupwizard.tests.activity
Bug:
34179495
Change-Id: Ic69487f51d1bd139825e6a8054a49ce143065a57
Gustav Sennton [Thu, 2 Feb 2017 14:34:01 +0000 (14:34 +0000)]
Merge "Make sure we cannot use packages targeting pre-O as WebView packages."
Esteban Talavera [Thu, 2 Feb 2017 14:15:50 +0000 (14:15 +0000)]
Merge "Affiliated profile owners can set lock task packages"
Diego Perez [Thu, 2 Feb 2017 14:03:06 +0000 (14:03 +0000)]
Merge "Add ability to promote classes to public visibility"
Narayan Kamath [Thu, 2 Feb 2017 13:31:33 +0000 (13:31 +0000)]
Revert "Call ActivityCallbacks after corresponding activity methods"
This reverts commit
660cf30e2100d8ed40198c95f93b61e5d1cdb10c.
bug:
34415265
bug:
34914977
Test: chrome launches
Change-Id: I170365fd47313bafb0d722e6d55ee119336137c4
Chris Wren [Wed, 1 Feb 2017 19:21:43 +0000 (14:21 -0500)]
port status bar logs to Tron V2
Bug:
33303260
Test: runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/logging/legacy/ && runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone
Change-Id: I7746b846247e930617f0b440217635e71ed58bb5
Diego Perez [Tue, 24 Jan 2017 15:55:53 +0000 (15:55 +0000)]
Add ability to promote classes to public visibility
Test: Added new PromoteClassClassAdapterTest
Change-Id: I30f9ee259d39e2b2768c1ceb45aa2161983c5a5e
(cherry picked from commit
294f0850f7623737899c9ea0b03cebc2cf7e4176)
Hyunyoung Song [Thu, 2 Feb 2017 08:53:06 +0000 (00:53 -0800)]
Handle nullable drawables inside MaskableIconDrawable
Test: manual test
b/
34902453
Change-Id: I36fc48f7e4c1f6503a9c26b8f239c62da729b490
Ying Wai (Daniel) Fan [Thu, 2 Feb 2017 08:32:09 +0000 (08:32 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity."
Hugo Benichi [Thu, 2 Feb 2017 07:33:33 +0000 (07:33 +0000)]
Merge "Revert "Merge "Define Network notification proto constants." am:
05550d9ed8 am:
6236f49f0e am:
7b39349792"" into nyc-mr2-dev-plus-aosp
Hugo Benichi [Thu, 2 Feb 2017 07:32:16 +0000 (07:32 +0000)]
Revert "Merge "Define Network notification proto constants." am:
05550d9ed8 am:
6236f49f0e am:
7b39349792"
This reverts commit
814a59ba829642d09b6d1eaf9bcf06ee44bffad4 because it broke the build by duplicating code that was already there.
Change-Id: I1e32fd9e70629e5725e503ca372fb20c0aa0035d
Erik Kline [Thu, 2 Feb 2017 07:32:09 +0000 (07:32 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am:
c313123afe am:
6f32aa0259
am:
7196e935a8
Change-Id: I2ab05143299f13012dc2a88efca52160e08c6d97
Sergei Vasilinetc [Thu, 2 Feb 2017 07:27:09 +0000 (07:27 +0000)]
Merge "Hardware bitmaps: Destroy texture ID generated for the copy"
Erik Kline [Thu, 2 Feb 2017 07:27:13 +0000 (07:27 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()" am:
c313123afe
am:
6f32aa0259
Change-Id: I6828bc3bb094ca8597ca2d8538045758638c374f
Erik Kline [Thu, 2 Feb 2017 07:22:05 +0000 (07:22 +0000)]
Merge "Add ConnectivityManager.networkCapabilitiesForType()"
am:
c313123afe
Change-Id: I0ad50fbf38f11b383fd889dc598cfddd47051477