Winson Chung
ba7db92d16
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
2017-02-02 19:43:54 +00:00
TreeHugger Robot
ddb80216b9
Merge "Addition separation of adding vs. reparenting activity"
2017-02-02 16:58:57 +00:00
Erik Kline
ee929e69fb
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 am: 180a3d07a8 am: d85f448274
...
am: 2ebea21074
2017-02-02 16:52:43 +00:00
Jerome Gaillard
abf19d1aa4
Merge changes Ic8254f0f,I1f285c3b
...
* changes:
Ignore justified in layoutlib for the moment
Update Canvas_Delegate after Change I3edc963a
2017-02-02 16:12:26 +00:00
TreeHugger Robot
8308526d88
Merge "Framework: Preloaded-classes tuning"
2017-02-02 16:07:43 +00:00
Wale Ogunwale
a0cd15e1a0
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
2017-02-02 06:48:56 -08:00
Gustav Sennton
f9295bcc24
Merge "Make sure we cannot use packages targeting pre-O as WebView packages."
2017-02-02 14:34:04 +00:00
Esteban Talavera
3355950785
Merge "Affiliated profile owners can set lock task packages"
2017-02-02 14:15:55 +00:00
Diego Perez
650d78042e
Merge "Add ability to promote classes to public visibility"
2017-02-02 14:03:11 +00:00
Narayan Kamath
ff5659fbc3
Revert "Call ActivityCallbacks after corresponding activity methods"
...
This reverts commit 660cf30e21
2017-02-02 13:55:31 +00:00
Diego Perez
b74f748579
Add ability to promote classes to public visibility
...
Test: Added new PromoteClassClassAdapterTest
Change-Id: I30f9ee259d39e2b2768c1ceb45aa2161983c5a5e
(cherry picked from commit 294f0850f7623737899c9ea0b03cebc2cf7e4176)
2017-02-02 10:34:38 +00:00
Hyunyoung Song
3084ec2df4
Handle nullable drawables inside MaskableIconDrawable
...
Test: manual test
b/34902453
Change-Id: I36fc48f7e4c1f6503a9c26b8f239c62da729b490
2017-02-02 00:59:13 -08:00
Ying Wai (Daniel) Fan
419fbce429
Merge "Prevent division-by-zero error when calculating battery capacity."
2017-02-02 08:32:13 +00:00
Sergei Vasilinetc
f2ca8e030c
Merge "Hardware bitmaps: Destroy texture ID generated for the copy"
2017-02-02 07:27:14 +00:00
TreeHugger Robot
82c8e5c960
Merge "No warning/info log for expected/normal situations"
2017-02-02 06:46:33 +00:00
TreeHugger Robot
8585249248
Merge "Avoid NPE in NightDisplayService when VR mode is invoked"
2017-02-02 06:43:03 +00:00
Andreas Gampe
0db10fd0bb
Framework: Preloaded-classes tuning
...
Run the regular use case study.
Bug: 34890992
Test: m
Test: Device boots
Change-Id: I8387b3b09713bd3a031073c14109393a2583c764
2017-02-01 22:19:52 -08:00
Erik Kline
2ebea21074
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5 am: 180a3d07a8
...
am: d85f448274
2017-02-02 05:25:05 +00:00
Erik Kline
d85f448274
Merge "Add test for repeated calls to registerMobileUpstreamRequest()" am: 603eefd5d5
...
am: 180a3d07a8
2017-02-02 05:20:05 +00:00
Erik Kline
180a3d07a8
Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
...
am: 603eefd5d5
2017-02-02 05:15:23 +00:00
Tomasz Mikolajewski
813ef268ac
Merge "Add plain mode for the quick viewer."
2017-02-02 05:10:31 +00:00
Treehugger Robot
603eefd5d5
Merge "Add test for repeated calls to registerMobileUpstreamRequest()"
2017-02-02 05:07:23 +00:00
TreeHugger Robot
0a6d2b6dac
Merge "Fix AutoFill Save window layout params."
2017-02-02 03:58:47 +00:00
Tomasz Mikolajewski
867addf393
Add plain mode for the quick viewer.
...
When EXTRA_QUICK_VIEW_PLAIN is passed, then plain UI should be shown.
This is just a hint for third party apps, whic may ignore it.
Test: Not testable, as it's just a hint.
Bug: 32161075
Change-Id: Ie244d28d552f6c654be93a5749ac164d2a77d25f
2017-02-02 12:21:16 +09:00
Suprabh Shukla
b99369c8a4
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: 3ee26841fd
...
am: a843ab955c
2017-02-02 03:07:56 +00:00
Suprabh Shukla
a843ab955c
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: 3ee26841fd
2017-02-02 03:03:20 +00:00
Suprabh Shukla
3ee26841fd
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
2017-02-02 02:57:58 +00:00
Jason Monk
87562128ee
Merge "QS: Remove circles and add lines"
2017-02-02 02:53:52 +00:00
Suprabh Shukla
ac8f44e387
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
2017-02-02 02:53:21 +00:00
Suprabh Shukla
2f1b2d82ca
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
2017-02-02 02:48:23 +00:00
Suprabh Shukla
029364c505
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours
...
am: 773f85ec60
2017-02-02 02:43:24 +00:00
Suprabh Shukla
773f85ec60
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab
...
am: 588411fc7c
2017-02-02 02:38:24 +00:00
Suprabh Shukla
588411fc7c
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3
...
am: 2e6bdbeaab
2017-02-02 02:32:48 +00:00
Suprabh Shukla
2e6bdbeaab
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8
...
am: ab8d3febd3
2017-02-02 02:28:13 +00:00
Suprabh Shukla
ab8d3febd3
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
...
am: 4ffe72dcc8
2017-02-02 02:21:16 +00:00
Felipe Leme
5523f9a2fc
Merge "Improved AutoFill Save workflow."
2017-02-02 02:05:32 +00:00
sergeyv
9f4a82f569
Hardware bitmaps: Destroy texture ID generated for the copy
...
Test: manual
bug:34807359
Change-Id: Idb1ef2a2efcb3cf7fb96e2a1f0554a06e7cd0fc2
2017-02-01 17:50:27 -08:00
Makoto Onuki
82233e9203
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b am: f1e276384d am: 46bfcb9961 -s ours
...
am: 62c651d4d5
2017-02-02 01:29:49 +00:00
Makoto Onuki
62c651d4d5
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b am: f1e276384d
...
am: 46bfcb9961
2017-02-02 01:25:19 +00:00
Makoto Onuki
46bfcb9961
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b
...
am: f1e276384d
2017-02-02 01:19:52 +00:00
Makoto Onuki
f1e276384d
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc
...
am: 963cba5b5b
2017-02-02 01:15:44 +00:00
Makoto Onuki
963cba5b5b
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc
...
am: 01f971dcdc
2017-02-02 01:10:43 +00:00
Makoto Onuki
01f971dcdc
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
...
am: 2317451acc
2017-02-02 01:03:21 +00:00
TreeHugger Robot
d8a937e02e
Merge "Add dumpsys options to procstats to inject screen state"
2017-02-02 01:02:33 +00:00
Winson Chung
b0412060ea
Merge changes Iad270dfd,Ice608e6d,I375369a8
...
* changes:
Adding initial TRON logging for picture-in-picture.
Disallow entering PiP when activity is locked.
Preventing cases where an app can be stopped while entering PiP.
2017-02-02 00:23:08 +00:00
TreeHugger Robot
58f34b828d
Merge "Start MtpDocumentsService as foreground service."
2017-02-02 00:13:34 +00:00
Daichi Hirono
d3c6dd1522
Start MtpDocumentsService as foreground service.
...
Prevously MtpDocumentsService was started as background service, then it
turns into a foreground service by calling Service#startForeground.
The workflow did not work until this, because now background activity
cannot launch a background service.
The CL starts using NotificationManager#startForegroundService to launch
MtpDocumentsService so that the service can be started as foreground
service directly.
Bug: 34468813
Test: MtpDocumentsProviderTests
Test: manual testing with connecting MTP device to Android
Change-Id: Ic35d3e92f234881846e5d82ed04d6681a83035f7
2017-02-02 00:13:08 +00:00
Steven Thomas
1e9b4b07c9
Avoid NPE in NightDisplayService when VR mode is invoked
...
Bug: b/32086748
Test: I was seeing the crash without the CL. With the CL no more crash.
Change-Id: I286af1066ce8928ed72a83a8da645fe99953fd85
2017-02-01 15:53:13 -08:00
Mark Renouf
362b4131bc
Merge "Removing extraneous translations"
2017-02-01 23:30:56 +00:00
TreeHugger Robot
bc5d58307a
Merge "Fix a bug in View#hasFocusable with new auto-focusable behavior"
2017-02-01 23:23:43 +00:00
