OSDN Git Service
Seigo Nonaka [Mon, 19 Mar 2018 20:57:27 +0000 (20:57 +0000)]
Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev
am:
b3aec698e8
Change-Id: I53dfdbfbd7d9a1278ae1e82e98f21cbddbc0cf55
Adrian Roos [Mon, 19 Mar 2018 20:50:28 +0000 (20:50 +0000)]
Merge changes Ifc6355e2,Ia8afa338 into pi-dev
am:
ba9e18c2a8
Change-Id: Idc7c51b688da32f447b0f17873853923bf724278
Felipe Leme [Mon, 19 Mar 2018 20:46:58 +0000 (20:46 +0000)]
Merge "Cosmetic changes on Field Classification TODOs and docs." into pi-dev
am:
a96583edf6
Change-Id: If54a4c871affdaaf91134760c7948925c419f342
Alice Sheng [Mon, 19 Mar 2018 20:33:11 +0000 (20:33 +0000)]
Merge "Add setting for enabling CPU frequency scaling." into pi-dev
am:
1799f2b878
Change-Id: I297da1b2ed52e81bb632842b468237d2b0ed31a9
Android Build Merger (Role) [Mon, 19 Mar 2018 20:23:39 +0000 (20:23 +0000)]
Merge "Merge "Bluetooth: preserve one advertisement slot for GMS core" into pi-dev am:
fd7d9c5710" into pi-dev-plus-aosp
Qiyu Hu [Mon, 19 Mar 2018 20:22:56 +0000 (20:22 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core" into pi-dev
am:
fd7d9c5710
Change-Id: I3a4d8033c219dbb53d618e4588cf5ed39b9a4e0b
Android Build Merger (Role) [Mon, 19 Mar 2018 20:19:13 +0000 (20:19 +0000)]
Merge "Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev am:
a946d88011" into pi-dev-plus-aosp
Felipe Leme [Mon, 19 Mar 2018 20:18:36 +0000 (20:18 +0000)]
Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev
am:
a946d88011
Change-Id: Ie944c93a7586ff1de665d92590a57e541c4b7d1c
Android Build Merger (Role) [Mon, 19 Mar 2018 20:16:18 +0000 (20:16 +0000)]
Merge "Merge "Add the AVRCP Target Service (2/2)" am:
61265410e8 am:
a33ad4f2bd" into pi-dev-plus-aosp
Ajay Panicker [Mon, 19 Mar 2018 20:15:32 +0000 (20:15 +0000)]
Merge "Add the AVRCP Target Service (2/2)" am:
61265410e8
am:
a33ad4f2bd
Change-Id: I2f34d563e1bf8224a9388701d9d8718d7aec3a0a
Alex Kershaw [Mon, 19 Mar 2018 20:15:31 +0000 (20:15 +0000)]
Merge "Fix Javadoc of DevicePolicyManager#setStorageEncryption to reflect that it's a no-op (and silent fail) when called from a non-system user." into pi-dev
am:
56be97edd0
Change-Id: I26c48173f62c19c437a6f24bd63159f80e3f6fb1
Ajay Panicker [Mon, 19 Mar 2018 20:03:32 +0000 (20:03 +0000)]
Merge "Add the AVRCP Target Service (2/2)"
am:
61265410e8
Change-Id: I6174f0e40d0a9bcb0f079b1f0ff87b3a5188bfef
David Chen [Mon, 19 Mar 2018 19:46:12 +0000 (19:46 +0000)]
Merge "Deletes default allowed_log_sources in statsd." into pi-dev
am:
f5de606f51
Change-Id: Id288fe64ea4027445b473185cee0b71bf0fde3bd
Tyler Gunn [Mon, 19 Mar 2018 19:40:01 +0000 (19:40 +0000)]
Merge "Rename handover failure constant per API review comments." am:
7c8a877231
am:
ffe1c22271
Change-Id: Icae03afa86e7b660e9f52df252d2e3c961762be8
Jong Wook Kim [Mon, 19 Mar 2018 19:29:01 +0000 (19:29 +0000)]
Merge "Display that MAC is randomized in About Phones" into pi-dev
am:
a6268f8c9d
Change-Id: I6ca9515d6c1568e5b19609cef2870cdd74859845
Adrian Roos [Mon, 19 Mar 2018 19:22:25 +0000 (19:22 +0000)]
Merge "Fix PackageParser tests" into pi-dev
am:
65a84cafaf
Change-Id: Ieeb1e9359ffb766aa83686711f88b95e29be06e6
Mike Ma [Mon, 19 Mar 2018 19:19:25 +0000 (19:19 +0000)]
Merge "Resolve STATSD and batterystats race condition" into pi-dev
am:
1639c330fc
Change-Id: I7715069130c5e8d3d4b74cdc8da4306942931627
John Reck [Mon, 19 Mar 2018 19:12:20 +0000 (19:12 +0000)]
Merge "Don't use IPC in isolateProcess" into pi-dev
am:
75cd1c0334
Change-Id: If943e25ce31246bbc4267402b679665f674980ef
TreeHugger Robot [Mon, 19 Mar 2018 19:02:34 +0000 (19:02 +0000)]
Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev
Chavi Weingarten [Mon, 19 Mar 2018 19:01:53 +0000 (19:01 +0000)]
Merge changes I72119772,I124e4cc0,I462d4dfc into pi-dev
am:
22ab2b9636
Change-Id: I90a1f1a43c46d8f12028f82df4a161b3392b851b
TreeHugger Robot [Mon, 19 Mar 2018 18:48:32 +0000 (18:48 +0000)]
Merge changes Ifc6355e2,Ia8afa338 into pi-dev
* changes:
DisplayCutout: Correctly apply light status bar
Letterboxing: ensure bar contrast
TreeHugger Robot [Mon, 19 Mar 2018 18:44:24 +0000 (18:44 +0000)]
Merge "Cosmetic changes on Field Classification TODOs and docs." into pi-dev
Bruno Martins [Mon, 19 Mar 2018 18:43:57 +0000 (18:43 +0000)]
Merge "DndTile: Avoid yet another NPE during boot up phase" am:
2446a10799
am:
1fa90bc5a4
Change-Id: Ib78e3254cd1245c95edeff8a91d5e8bac9e75cf6
Alice Sheng [Mon, 19 Mar 2018 18:41:40 +0000 (18:41 +0000)]
Merge "Add setting for enabling CPU frequency scaling." into pi-dev
Treehugger Robot [Mon, 19 Mar 2018 18:38:40 +0000 (18:38 +0000)]
Merge "Add the AVRCP Target Service (2/2)"
Tyler Gunn [Mon, 19 Mar 2018 18:36:10 +0000 (18:36 +0000)]
Merge "Rename handover failure constant per API review comments."
am:
7c8a877231
Change-Id: Ic3cd64d00f6c5a44acb9f6913fe728bd252fa99a
Bill Yi [Mon, 19 Mar 2018 18:33:06 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
1b929db32d -s ours
Change-Id: I9529b1f9a27e39c4a890e771167ffdc726524fec
Bruno Martins [Mon, 19 Mar 2018 18:29:17 +0000 (18:29 +0000)]
Merge "DndTile: Avoid yet another NPE during boot up phase"
am:
2446a10799
Change-Id: I211f94c3dedc4f288d436ba3aff7f52309a994d3
TreeHugger Robot [Mon, 19 Mar 2018 18:28:28 +0000 (18:28 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core" into pi-dev
Bill Yi [Mon, 19 Mar 2018 18:27:38 +0000 (18:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
dfd6bba802 -s ours
Change-Id: I94e9ca0e32ed43bc09007ea785db330e9671ac9d
Felipe Leme [Mon, 19 Mar 2018 18:27:20 +0000 (18:27 +0000)]
Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev
Felipe Leme [Mon, 19 Mar 2018 18:15:00 +0000 (11:15 -0700)]
Fixed AutofillManager.isAutofillUiShowing()
It was using & instead of &&
Test: not really
Bug:
75652829
Bug:
74527545
Change-Id: Ib8ca79ba6ec35d2fc97f042db2152b03d334ce30
Mike Digman [Mon, 19 Mar 2018 18:24:10 +0000 (18:24 +0000)]
Merge "Fix KeyButtonDrawable dark intensity logic error" into pi-dev
am:
def169559c
Change-Id: If28cc5fbbf7912912949bcfab76f5456d28ad6d8
Bill Yi [Mon, 19 Mar 2018 18:18:01 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
a903eebde6 -s ours
Change-Id: I945604f8492a09b3037f9f24610725bde38e4e29
Alex Kershaw [Mon, 19 Mar 2018 18:17:23 +0000 (18:17 +0000)]
Merge "Fix Javadoc of DevicePolicyManager#setStorageEncryption to reflect that it's a no-op (and silent fail) when called from a non-system user." into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 18:14:18 +0000 (18:14 +0000)]
Merge "Deletes default allowed_log_sources in statsd." into pi-dev
Jong Wook Kim [Mon, 19 Mar 2018 18:14:08 +0000 (18:14 +0000)]
Merge "Display that MAC is randomized in About Phones" into pi-dev
Bill Yi [Mon, 19 Mar 2018 18:11:53 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
3f1a583000 -s ours
Change-Id: I0a91bc2f2e6fbdf58d72181538abdcf1e0ca8a7a
Mike Digman [Mon, 19 Mar 2018 18:08:29 +0000 (18:08 +0000)]
Merge "Add disable2 flag for rotate suggestions" into pi-dev
am:
bd24572e17
Change-Id: I4b5cd5aa47debaedb115bd78cdd19fdda2bba552
Adrian Roos [Mon, 19 Mar 2018 18:02:22 +0000 (18:02 +0000)]
Merge "Fix PackageParser tests" into pi-dev
Mathew Inwood [Mon, 19 Mar 2018 18:01:29 +0000 (18:01 +0000)]
Merge "Light greylist additions." into pi-dev
am:
02a4219cb7
Change-Id: Ic7e112599f93b00e80dc18766db6f6c3cc58a68d
TreeHugger Robot [Mon, 19 Mar 2018 18:00:40 +0000 (18:00 +0000)]
Merge "Resolve STATSD and batterystats race condition" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:56:14 +0000 (17:56 +0000)]
Merge "Don't use IPC in isolateProcess" into pi-dev
Amin Shaikh [Mon, 19 Mar 2018 17:53:45 +0000 (17:53 +0000)]
Merge "Update mobile data off dialog." into pi-dev
am:
372719cb35
Change-Id: I5a6683df112df1672bd943d7bc21e387336a0668
Chavi Weingarten [Mon, 19 Mar 2018 17:40:31 +0000 (17:40 +0000)]
Merge changes I72119772,I124e4cc0,I462d4dfc into pi-dev
* changes:
Clear all options from Task when any ActivityRecord consumes the options.
Revert "Set options on startingActivity instead of topActivity"
Revert "Set options for activity being brought to front."
Lorenzo Colitti [Mon, 19 Mar 2018 17:39:34 +0000 (17:39 +0000)]
Merge "Enable cleartext for captive portal apps" into pi-dev
am:
c88ca67bb3
Change-Id: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb
Andreas Gampe [Mon, 19 Mar 2018 17:29:05 +0000 (17:29 +0000)]
Merge "Frameworks: Make MockUtils more robust" into pi-dev
am:
16e56f7815
Change-Id: I9b4d9a9ef82cf373eed15cea47dd0a73aacbe56c
TreeHugger Robot [Mon, 19 Mar 2018 17:24:17 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:22:52 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Mike Digman [Mon, 19 Mar 2018 17:22:39 +0000 (17:22 +0000)]
Merge "Fix KeyButtonDrawable dark intensity logic error" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:17:52 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:17:12 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Tyler Gunn [Mon, 19 Mar 2018 17:15:58 +0000 (17:15 +0000)]
Merge "Rename handover failure constant per API review comments."
Wale Ogunwale [Mon, 19 Mar 2018 17:13:32 +0000 (17:13 +0000)]
Merge "Removed flaky annotation from testFocusedWindowMultipleDisplays" into pi-dev
am:
2112d11eee
Change-Id: I92f66a688bd1f56c9f0714cad9513d9dd25bc8e6
Mike Digman [Mon, 19 Mar 2018 17:13:30 +0000 (17:13 +0000)]
Merge "Add disable2 flag for rotate suggestions" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 17:08:45 +0000 (17:08 +0000)]
Merge "Light greylist additions." into pi-dev
Sarah Edris [Mon, 19 Mar 2018 17:05:51 +0000 (17:05 +0000)]
Merge "Whitelist FullBackupDataOutput" into pi-dev
am:
ff964696a1
Change-Id: I3145ae862985713a2db4f8d966f3791c98a7cd88
Seigo Nonaka [Mon, 19 Mar 2018 17:04:30 +0000 (17:04 +0000)]
Revert "Make PrecomputedText Spannable for supporting selection"
Crash on Sheets APp
This reverts commit
80ed5a35a90b62b8070d861b9755e230bd679951.
Bug:
75652829
Change-Id: I40ddd1b9754e74fbd90d7a029cce9c6a7ede0777
Test: Manual
TreeHugger Robot [Mon, 19 Mar 2018 16:58:23 +0000 (16:58 +0000)]
Merge "Update mobile data off dialog." into pi-dev
Salvador Martinez [Mon, 19 Mar 2018 16:52:50 +0000 (16:52 +0000)]
Merge "Softens one of the battery strings per UI request" into pi-dev
am:
a822d42415
Change-Id: I4c06a0be211a09650ccf78787f295b2c3602fa8e
Adrian Roos [Mon, 19 Mar 2018 16:47:12 +0000 (17:47 +0100)]
DisplayCutout: Correctly apply light status bar
Fixes an issue where light navigation bar was not
properly applied in landscape where the letterbox
does not overlap with the status bar.
This removes a hack that is no longer necessary
now that we track exactly if the letterbox overlaps
the system bars and put them into black-background
mode if so.
Bug:
72696928
Test: Open API Demos > Activity > Max Aspect Ratio > Any; rotate to landscape, verify that status bar is light.
Change-Id: Ifc6355e2eeadf0821c9ac82ce78c812916de5034
Lorenzo Colitti [Mon, 19 Mar 2018 16:49:47 +0000 (16:49 +0000)]
Merge "Enable cleartext for captive portal apps" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:47:30 +0000 (16:47 +0000)]
Merge "Frameworks: Make MockUtils more robust" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:46:19 +0000 (16:46 +0000)]
Merge "Removed flaky annotation from testFocusedWindowMultipleDisplays" into pi-dev
Sarah Edris [Mon, 19 Mar 2018 16:42:39 +0000 (16:42 +0000)]
Merge "Whitelist FullBackupDataOutput" into pi-dev
Bookatz [Mon, 19 Mar 2018 16:39:14 +0000 (16:39 +0000)]
Merge "StatsManager log lines should be in logcat" into pi-dev
am:
781533dc32
Change-Id: I9b79b21a8588d4dd927a6d16bd2fb437aa69c720
Treehugger Robot [Mon, 19 Mar 2018 16:31:29 +0000 (16:31 +0000)]
Merge "DndTile: Avoid yet another NPE during boot up phase"
TreeHugger Robot [Mon, 19 Mar 2018 16:27:41 +0000 (16:27 +0000)]
Merge "Softens one of the battery strings per UI request" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:18:53 +0000 (16:18 +0000)]
Merge "StatsManager log lines should be in logcat" into pi-dev
Jong Wook Kim [Wed, 14 Mar 2018 18:16:06 +0000 (11:16 -0700)]
Display that MAC is randomized in About Phones
When Connected MAC Randomization is enabled and the device is
disconnected, there isn't a valid MAC address to display since we don't
know what the device's next MAC address is going to be.
In such cases, display "MAC address is randomized" instead of an invalid
MAC address in About Phones page.
Bug:
73663275
Test: make RunSettingsLibRoboTests -j40
Change-Id: I0a4df2b1b0823632b26f90e097c26f47dd5a0a67
Jorim Jaggi [Mon, 19 Mar 2018 15:51:32 +0000 (15:51 +0000)]
Merge "Insert correct app transition events for recents anim" into pi-dev
am:
f8cb545afb
Change-Id: I573a25113afd6666c95ceedefb33e7c994624e0d
Jorim Jaggi [Mon, 19 Mar 2018 15:36:05 +0000 (15:36 +0000)]
Merge "Insert correct app transition events for recents anim" into pi-dev
Makoto Onuki [Mon, 19 Mar 2018 15:24:17 +0000 (15:24 +0000)]
Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev
am:
6b71daa0c2
Change-Id: Ie14b1bdf696ed3b67867f08d5f10800d2330eddf
Makoto Onuki [Mon, 19 Mar 2018 15:12:36 +0000 (15:12 +0000)]
Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev
Adrian Roos [Thu, 15 Mar 2018 14:41:13 +0000 (15:41 +0100)]
Letterboxing: ensure bar contrast
Ensures that any bars that draw over a letterbox draw their own
background such that they always have contrast.
This fixes an issue, where if a light status / navigation bar app was
letterboxed, the bar would still draw dark icons over the now black
letterbox, making the icons unreadable.
To do so, splits the letterbox into a layout and an apply surface
changes phase.
Change-Id: Ia8afa3386d75d9a72434d701b867c3ebc35cc36f
Fixes:
72696928
Test: Open a letterboxed app with a white navigation bar, verify it is visible
Test: ApiDemos > App > Activity > Max Aspect Ratio > 1:1, verify navbar is visible
Jorim Jaggi [Thu, 15 Mar 2018 14:51:32 +0000 (15:51 +0100)]
Insert correct app transition events for recents anim
The transition delay will be the latency until all the leashes
were created etc. Thus, the actual latency is going to be in
WINDOWS_DRAWN_DELAY.
Also fix an issue where we inadvertently started a transition,
and then the transition logger was hanging.
Bug:
72967764
Test: Swipe up from home button, observe eventlog
Change-Id: I2b1fb7d9d694a629a33653c1fa3d5ed47f53de6b
Amin Shaikh [Fri, 9 Mar 2018 19:50:59 +0000 (14:50 -0500)]
Update mobile data off dialog.
Show the mobile data turn off dialog until the user taps the turn off
button. All subsequent toggles will immediately toggle data on/off. Also
update the message copy.
Fixes:
74072757
Test: runtest systemui && manual
Change-Id: I489d5c3c19d52a6f531b1b925b3210019412243b
Mathew Inwood [Mon, 19 Mar 2018 14:31:17 +0000 (14:31 +0000)]
Light greylist additions.
Gathered from dogfood bugreports.
Test: m
Bug:
74940461
Change-Id: I08a450f987ae0e87ab6f7306e9d89a7ca3368f70
Adrian Roos [Mon, 19 Mar 2018 13:51:02 +0000 (14:51 +0100)]
Fix PackageParser tests
Also adds the well-known-fields test to presubmit to prevent
similar breakage in the future.
Change-Id: I717396802b5978b2da9de78a6203303082663d38
Fixes:
75450512
Test: atest PackageParserTest
David Zeuthen [Mon, 19 Mar 2018 14:39:03 +0000 (14:39 +0000)]
Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev
am:
b57365562d
Change-Id: I5cc4ac36d980a4a0b6c202ddcba4ffb5433cd149
Wale Ogunwale [Mon, 19 Mar 2018 14:35:32 +0000 (07:35 -0700)]
Removed flaky annotation from testFocusedWindowMultipleDisplays
No longer flaky
https://dashboards.corp.google.com/google::_550f6bcf_09dd_4963_b94c_d243e37d002f?f=class_name:in:com.android.server.wm.DisplayContentTests&f=test_name:in:com.android.server.wm.DisplayContentTests.testFocusedWindowMultipleDisplays&f=run_date_usec:eq:(null)&f=presubmit:in:false&f=build_id:eq:(null)
Change-Id: I10504a24144e7636ab7205a079415f6d4eeba043
Fixes:
37908381
Test: self
TreeHugger Robot [Mon, 19 Mar 2018 14:27:16 +0000 (14:27 +0000)]
Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev
Sarah Edris [Mon, 19 Mar 2018 12:48:28 +0000 (12:48 +0000)]
Whitelist FullBackupDataOutput
Bug:
74424953
Test: N/A
Change-Id: I3b0386fa004352ef32cb03ba2c53a53bd0f6e1f1
Jason Monk [Mon, 19 Mar 2018 14:21:06 +0000 (14:21 +0000)]
Merge "Fix test failure" into pi-dev
am:
dff503b2e4
Change-Id: I1b42d1ce64ca03e9acf2fa3ce698f29bc1adc1a6
TreeHugger Robot [Mon, 19 Mar 2018 14:02:13 +0000 (14:02 +0000)]
Merge "Fix test failure" into pi-dev
David Brazdil [Mon, 19 Mar 2018 13:48:18 +0000 (13:48 +0000)]
Merge "Add more hidden APIs on the light greylist" into pi-dev
am:
1ffa03321a
Change-Id: Ie5d1cf0fb159a59cfe942da53b8ee382ed07b633
Jorim Jaggi [Mon, 19 Mar 2018 13:38:09 +0000 (13:38 +0000)]
Merge "Fix lockscreen notification launch animation" into pi-dev
am:
a1d6bd94fe
Change-Id: I12cbc8fbd9b087d882eebc8a1b2052e6988128c9
David Brazdil [Mon, 19 Mar 2018 13:31:55 +0000 (13:31 +0000)]
Merge "Add more hidden APIs on the light greylist" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 13:23:30 +0000 (13:23 +0000)]
Merge "Fix lockscreen notification launch animation" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 13:21:40 +0000 (13:21 +0000)]
Merge "Trace currently resumed app" into pi-dev
am:
782e63d507
Change-Id: Ieee8fabfa9564d52d60cc58f68af986d2e56e43e
Madiyar Aitbayev [Mon, 19 Mar 2018 13:14:53 +0000 (13:14 +0000)]
Merge "Close file descriptors of ProfilerInfo" into pi-dev
am:
de91eef76e
Change-Id: I3d7cbb7423cae868a52fc88e2055eea32831a390
Bill Yi [Mon, 19 Mar 2018 13:12:52 +0000 (06:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icb81b9c2336d04310365592f1cccb53dad0c0403
TreeHugger Robot [Mon, 19 Mar 2018 13:06:30 +0000 (13:06 +0000)]
Merge "Trace currently resumed app" into pi-dev
Bill Yi [Mon, 19 Mar 2018 12:57:48 +0000 (05:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I43866a852ad32c8acdcbd994e24f1604d32ee2af
TreeHugger Robot [Mon, 19 Mar 2018 12:53:21 +0000 (12:53 +0000)]
Merge "Close file descriptors of ProfilerInfo" into pi-dev
Wale Ogunwale [Mon, 19 Mar 2018 12:44:47 +0000 (12:44 +0000)]
Merge "Don't allow focus on activity in minimized split-screen." into pi-dev
am:
5a8deab6c8
Change-Id: I65db000108edf8f20119a8de11fbcaac28cc7efd
Wale Ogunwale [Mon, 19 Mar 2018 12:30:08 +0000 (12:30 +0000)]
Merge "Don't allow focus on activity in minimized split-screen." into pi-dev
Eran Messeri [Mon, 19 Mar 2018 11:38:35 +0000 (11:38 +0000)]
Merge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev
am:
31ac587b43
Change-Id: I8b07132a161275e55204598183c2cecfb7d9234d
TreeHugger Robot [Mon, 19 Mar 2018 11:20:27 +0000 (11:20 +0000)]
Merge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev
Jaewan Kim [Mon, 19 Mar 2018 10:59:39 +0000 (10:59 +0000)]
Merge "MediaSession2: Implement fastForward() / rewind()" into pi-dev
am:
d65bb20283
Change-Id: Id01780a8074428de178b49e8c7dbf3000bfdee71