OSDN Git Service
Brad Ebinger [Wed, 28 Mar 2018 20:52:29 +0000 (20:52 +0000)]
[automerger skipped] Merge "Parse SMS locally upon error to get message ref" am:
7a5653599c
am:
06cdcab7ba -s ours
Change-Id: Ic2c53def15379c202175a06b457b0a77b8872ddf
Brad Ebinger [Wed, 28 Mar 2018 20:40:37 +0000 (20:40 +0000)]
Merge "Parse SMS locally upon error to get message ref"
am:
7a5653599c
Change-Id: I95d354c130697849e6a7953fdf4f089c557f5a4e
Etan Cohen [Wed, 28 Mar 2018 20:33:31 +0000 (20:33 +0000)]
Merge "[RTT] Add API for number of measurements" into pi-dev
am:
d1c5b6695f
Change-Id: I75b5aa6eb2bea59ad8e022a00268b585a0de146c
Bill Yi [Wed, 28 Mar 2018 20:28:14 +0000 (20:28 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
7c862d461c -s ours
Change-Id: I192b22e7aaa4382365e22ff2d2b85b16aea21433
Yi Jin [Wed, 28 Mar 2018 20:17:44 +0000 (20:17 +0000)]
Merge "Found out it is not possible to exec procrank as non-root/shell. But it is ok to disable procrank since the information can be obtain via dumpsys meminfo" into pi-dev
am:
ab34199e9c
Change-Id: I46c9c001ceac7a9283db1ccf9c0ba438d6f65120
TreeHugger Robot [Wed, 28 Mar 2018 20:12:24 +0000 (20:12 +0000)]
Merge "[RTT] Add API for number of measurements" into pi-dev
Chenjie Yu [Wed, 28 Mar 2018 20:12:07 +0000 (20:12 +0000)]
Merge "Fix typo on pull alarm broadcast receiver" into pi-dev
am:
e100329647
Change-Id: I076b07d714b402c4b19dc8fdc947419d8da04d8b
TreeHugger Robot [Wed, 28 Mar 2018 20:06:18 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Salvador Martinez [Wed, 28 Mar 2018 20:05:50 +0000 (20:05 +0000)]
Merge "Update wifi header summary text to show metered state" into pi-dev
am:
740d37193f
Change-Id: I2fe3ef92aa1def1aab8a28b29a862c7d9a708488
Nicolas Geoffray [Wed, 28 Mar 2018 19:57:49 +0000 (19:57 +0000)]
Merge "Add new Wifi API to light grey." into pi-dev
am:
0bc998b32f
Change-Id: I9e63bdeda0f2747ba414ad152115dda45d136ca1
Jorim Jaggi [Wed, 28 Mar 2018 19:39:34 +0000 (19:39 +0000)]
Merge "Add different animation for transitions with translucent apps" into pi-dev
am:
13c4b14e92
Change-Id: Ice110754fd73cfc576c89bec346792cdcdd9802b
TreeHugger Robot [Wed, 28 Mar 2018 19:37:46 +0000 (19:37 +0000)]
Merge "Found out it is not possible to exec procrank as non-root/shell. But it is ok to disable procrank since the information can be obtain via dumpsys meminfo" into pi-dev
Dmitry Dementyev [Wed, 28 Mar 2018 19:33:33 +0000 (19:33 +0000)]
Merge "Use rootAlias to index chosen cert and its version." into pi-dev
am:
52bc5f2ae1
Change-Id: Id3926848ae5fdad1851b4193319a08652642d1e6
TreeHugger Robot [Wed, 28 Mar 2018 19:33:19 +0000 (19:33 +0000)]
Merge "Fix typo on pull alarm broadcast receiver" into pi-dev
Mohamed Abdalkader [Wed, 28 Mar 2018 19:29:25 +0000 (19:29 +0000)]
Merge "Grant CONTACT permissions to IMS package." into pi-dev
am:
a21c304be5
Change-Id: I416b47c238599addefd7fca124897ea6541fcdff
Felipe Leme [Wed, 28 Mar 2018 19:20:02 +0000 (19:20 +0000)]
Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev
am:
b8c00934cb
Change-Id: Iea7cded56990ae09d5f60bbbc63978273092db6e
TreeHugger Robot [Wed, 28 Mar 2018 19:15:05 +0000 (19:15 +0000)]
Merge "Update wifi header summary text to show metered state" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 19:14:49 +0000 (19:14 +0000)]
Merge "Add new Wifi API to light grey." into pi-dev
Jorim Jaggi [Wed, 28 Mar 2018 19:09:08 +0000 (19:09 +0000)]
Merge "Add different animation for transitions with translucent apps" into pi-dev
Dmitry Dementyev [Wed, 28 Mar 2018 19:05:21 +0000 (19:05 +0000)]
Merge "Use rootAlias to index chosen cert and its version." into pi-dev
Vishwath Mohan [Wed, 28 Mar 2018 19:01:11 +0000 (19:01 +0000)]
Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev
am:
86ed912f5a
Change-Id: I2582d4770900460a8d37c9d832e9a20583f9adf9
TreeHugger Robot [Wed, 28 Mar 2018 18:57:50 +0000 (18:57 +0000)]
Merge "Grant CONTACT permissions to IMS package." into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 18:54:38 +0000 (18:54 +0000)]
Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev
Mathew Inwood [Wed, 28 Mar 2018 18:46:42 +0000 (18:46 +0000)]
Merge "Use commas to separate API exemptions list, not colon." am:
2fddfcdced
am:
9f85ad8c99
Change-Id: Idc8adc6ccc505b1264cc8e26c76f067ae4abca1f
Vishwath Mohan [Wed, 28 Mar 2018 18:46:34 +0000 (18:46 +0000)]
Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev
Mathew Inwood [Wed, 28 Mar 2018 18:38:48 +0000 (18:38 +0000)]
Merge "Use commas to separate API exemptions list, not colon."
am:
2fddfcdced
Change-Id: I8435589ca414dec8ac7a857f6639b8d39fa18d98
Myles Watson [Wed, 28 Mar 2018 18:38:28 +0000 (18:38 +0000)]
[automerger skipped] Merge "Tell the user to toggle Bluetooth when enabling HCI logs" into pi-dev
am:
8dfb334264 -s ours
Change-Id: I86f50d8ce99308699f2f1c8392c04037a2930403
Jerry Zhang [Wed, 28 Mar 2018 18:32:57 +0000 (18:32 +0000)]
Merge "Fix Unicode handling." into pi-dev
am:
59f888d94c
Change-Id: Id5f085e6f0b9f0aa705cbb6d9eef97b79fbe5982
Felipe Leme [Wed, 28 Mar 2018 18:25:50 +0000 (18:25 +0000)]
Merge "Added autofill cmds to get and set full-screen mode." into pi-dev
am:
39531e28ed
Change-Id: I2b99ee1e6aad140869eb769709fdd559d8f555a3
TreeHugger Robot [Wed, 28 Mar 2018 18:19:39 +0000 (18:19 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs" into pi-dev
Bill Yi [Wed, 28 Mar 2018 18:12:39 +0000 (11:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If50c887a445b8a4a30107830a7dbe67eea17ddbd
Jerry Zhang [Wed, 28 Mar 2018 18:16:48 +0000 (18:16 +0000)]
Merge "Fix Unicode handling." into pi-dev
Jiuyu Sun [Wed, 28 Mar 2018 18:08:43 +0000 (18:08 +0000)]
Merge "Add grant and revoke default permissions to active LUI app." into pi-dev
am:
b1adae546c
Change-Id: Ic58c98fac6a1b792ca9525653b3e07e5839741f4
TreeHugger Robot [Wed, 28 Mar 2018 18:07:17 +0000 (18:07 +0000)]
Merge "Added autofill cmds to get and set full-screen mode." into pi-dev
Jiuyu Sun [Wed, 28 Mar 2018 17:44:35 +0000 (17:44 +0000)]
Merge "Add grant and revoke default permissions to active LUI app." into pi-dev
Jan Althaus [Wed, 28 Mar 2018 17:23:56 +0000 (17:23 +0000)]
Merge "Change TextClassification to use RemoteActions" into pi-dev
am:
08a75e0ee7
Change-Id: I411c8b207e24c6a4e9ca8660619fae1e0a3a8ef7
Chavi Weingarten [Wed, 28 Mar 2018 17:08:38 +0000 (17:08 +0000)]
Merge "Set snapTargetBeforeMinimized to middle target if position is negative" into pi-dev
am:
5e86c3c28d
Change-Id: Iaec2e71f18816581ffd2172247512cfcc2810306
Jan Althaus [Wed, 28 Mar 2018 17:04:58 +0000 (17:04 +0000)]
Merge "Change TextClassification to use RemoteActions" into pi-dev
Brad Ebinger [Wed, 28 Mar 2018 16:59:41 +0000 (16:59 +0000)]
Merge "Parse SMS locally upon error to get message ref"
Lei Yu [Wed, 28 Mar 2018 16:57:37 +0000 (16:57 +0000)]
Merge "Change the time format to short" into pi-dev
am:
9bd77dea82
Change-Id: Id8856049a5e805a7eec4539b434643d445defa74
Treehugger Robot [Wed, 28 Mar 2018 16:57:30 +0000 (16:57 +0000)]
Merge "Use commas to separate API exemptions list, not colon."
Chavi Weingarten [Wed, 28 Mar 2018 16:49:07 +0000 (16:49 +0000)]
Merge "Set snapTargetBeforeMinimized to middle target if position is negative" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 16:45:45 +0000 (16:45 +0000)]
Merge "Change the time format to short" into pi-dev
Yohei Yukawa [Wed, 28 Mar 2018 16:36:36 +0000 (16:36 +0000)]
Merge "Improve the JavaDoc for SOFT_INPUT_STATE_UNSPECIFIED" into pi-dev
am:
59ecb96da9
Change-Id: Id6292d96a01421ae8a50c4510d9f855cea1f3037
Myles Watson [Mon, 26 Mar 2018 21:28:46 +0000 (14:28 -0700)]
Tell the user to toggle Bluetooth when enabling HCI logs
Fixes:
67634644
Test: Manually inspect the new text in developer settings
Change-Id: Ic8b08c8d6d0c7727a03a265fb6b10a3c55fd96cb
Merged-In: Ic8b08c8d6d0c7727a03a265fb6b10a3c55fd96cb
(cherry picked from commit
81bd065c55d41242cf8eb9411d94d6b3912371fa)
Jorim Jaggi [Wed, 28 Mar 2018 16:30:12 +0000 (16:30 +0000)]
Merge "Fix issues with z-ordering during animations" into pi-dev
am:
baac6507dc
Change-Id: Id094d3ef25cee0e629e49be5b1d2a6b4834ff2ce
TreeHugger Robot [Wed, 28 Mar 2018 16:29:56 +0000 (16:29 +0000)]
Merge "Improve the JavaDoc for SOFT_INPUT_STATE_UNSPECIFIED" into pi-dev
Chenjie Yu [Wed, 28 Mar 2018 16:24:33 +0000 (09:24 -0700)]
Fix typo on pull alarm broadcast receiver
Bug:
75970648
Test: cts
Change-Id: Iaf64b5e55457c2ade476acbe23bf6d3a0e22f8ec
Jorim Jaggi [Wed, 28 Mar 2018 16:17:33 +0000 (16:17 +0000)]
Merge "Fix issues with z-ordering during animations" into pi-dev
David Brazdil [Wed, 28 Mar 2018 15:59:15 +0000 (15:59 +0000)]
Merge "Add more uses on vendor hidden API list" into pi-dev
am:
727bc1e101
Change-Id: I48a8cd8d764f9bd2bf602e1a262d9d4692df4136
David Brazdil [Wed, 28 Mar 2018 15:54:06 +0000 (15:54 +0000)]
Merge "Revert Revert: Enable hidden API blacklist" into pi-dev
am:
c60a932ae5
Change-Id: I95c824b6107083667be474c4fc1f8d3bbd22648e
David Brazdil [Wed, 28 Mar 2018 15:36:28 +0000 (15:36 +0000)]
Merge "Add more uses on vendor hidden API list" into pi-dev
David Brazdil [Wed, 28 Mar 2018 15:36:28 +0000 (15:36 +0000)]
Merge "Revert Revert: Enable hidden API blacklist" into pi-dev
Jorim Jaggi [Wed, 28 Mar 2018 15:25:29 +0000 (15:25 +0000)]
Merge "Fix issue with animations that couldn't be started" into pi-dev
am:
ff23ffa8ff
Change-Id: Icf311a611ed255f44f17b7dc72c5019ecc288e9d
Luis Hector Chavez [Wed, 28 Mar 2018 15:16:59 +0000 (15:16 +0000)]
Merge "Also allow avoiding gfx acceleration at runtime" into pi-dev
am:
744e6f1738
Change-Id: I3e691bac969b76ebfdd9ee3e3e3956fb53e64548
Adrian Roos [Wed, 28 Mar 2018 15:10:31 +0000 (15:10 +0000)]
Merge "DisplayCutout: Add clarifying images to LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES" into pi-dev
am:
95712fe0cb
Change-Id: Icde9a53fd8ff6825654c2992322354b1e7647964
David Brazdil [Wed, 28 Mar 2018 10:28:39 +0000 (11:28 +0100)]
Revert Revert: Enable hidden API blacklist
APIs which have not been explicitly greylisted have so far been put
on the dark greylist. This patch changes the default to blacklist and
therefore enables strict enforcement.
This reverts commit
f712b23d56226c788f7892a984fb9abe6f5144c2.
Bug:
64382372
Test: make
Change-Id: I1608b1adbe5dcafd13335691ddeb94abbb2c6e71
Jorim Jaggi [Wed, 28 Mar 2018 15:04:16 +0000 (15:04 +0000)]
Merge "Fix issue with animations that couldn't be started" into pi-dev
Jeff Sharkey [Wed, 28 Mar 2018 14:59:57 +0000 (14:59 +0000)]
Merge "Detect paths without lunch." into pi-dev
am:
7f0d63d158
Change-Id: Ia2e13d6e8929594f71debd70cc8998ab4e752cdc
TreeHugger Robot [Wed, 28 Mar 2018 14:58:10 +0000 (14:58 +0000)]
Merge "Also allow avoiding gfx acceleration at runtime" into pi-dev
Adrian Roos [Wed, 28 Mar 2018 14:56:19 +0000 (14:56 +0000)]
Merge "DisplayCutout: Add clarifying images to LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES" into pi-dev
Jeff Sharkey [Wed, 28 Mar 2018 14:47:05 +0000 (14:47 +0000)]
Merge "Detect paths without lunch." into pi-dev
Jorim Jaggi [Mon, 26 Mar 2018 14:17:07 +0000 (16:17 +0200)]
Add different animation for transitions with translucent apps
None of the existing animation really work with transitions in
which a translucent app is appearing/disappearing. Add a separate
animation for that and change all existing transitions to these
new transition types in case we detect that only translucent
activities are appearing/disappearing.
Test: Sharesheet animations
Test: go/wm-smoke
Change-Id: Iffe57b7664dddf647d723c91d115ade60c12ad33
Fixes:
37953606
Fixes:
70730519
Fixes:
72649981
Fixes:
72686618
Adrian Roos [Wed, 28 Mar 2018 14:42:13 +0000 (14:42 +0000)]
Merge "DisplayCutout: Fix attrs.xml javadoc" into pi-dev
am:
813a4bee76
Change-Id: I43eb3e82b86657a085ff9adba609e94a6fb3b031
Adrian Roos [Wed, 28 Mar 2018 14:29:08 +0000 (14:29 +0000)]
Merge "DisplayCutout: Fix attrs.xml javadoc" into pi-dev
Artem Iglikov [Wed, 28 Mar 2018 13:42:32 +0000 (13:42 +0000)]
Merge "Revert "Added safeguards for pushed brighntess curve."" into pi-dev
am:
f0e720ecde
Change-Id: Icc7904bc7c284e06b9bfa5f5145c46571ea7273b
Jorim Jaggi [Mon, 26 Mar 2018 14:14:12 +0000 (16:14 +0200)]
Fix issues with z-ordering during animations
- Make sure to use DC pending transaction when updating z-layers,
as it could lead to reordering of z-order assignment due to how
we apply pending transactions in the hierarchy
- Create a separate boosted animation layer in which AWT with
zOrder=top animate, which happens above all stack. This brings
back the boosting logic in O without boosting non-boosted stack
above non-animating tokens
Bug:
70730519
Bug:
72649981
Bug:
72686618
Bug:
37953606
Test: Share link from Chrome to Clipboard, make sure disappear
animation happens properly
Test: go/wm-smoke
Change-Id: I3957daac76b991402bf3f520c4a3d3f519933f72
Julia Reynolds [Wed, 28 Mar 2018 13:32:03 +0000 (13:32 +0000)]
Merge "Change the triggering criteria for blocking helper" into pi-dev
am:
0712a8781b
Change-Id: I8d60424a107a3c27d69007ef116e3c3799fd54db
Artem Iglikov [Wed, 28 Mar 2018 13:26:41 +0000 (13:26 +0000)]
Merge "Revert "Added safeguards for pushed brighntess curve."" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 13:18:45 +0000 (13:18 +0000)]
Merge "Change the triggering criteria for blocking helper" into pi-dev
Jorim Jaggi [Tue, 27 Mar 2018 16:02:18 +0000 (18:02 +0200)]
Fix issue with animations that couldn't be started
If we can't create a remote animation target for some reason
(removed from task, no main window, etc), SurfaceAnimator
called startAnimation but we never invoke the finish callback.
Thus, we need to make sure to also invoke the finish callback
when not using the AppWindowToken as part of the remote animation.
This actually happens if the main intent clears the task, like
Settings. In that case, it removes all sub activities, which then
get added to mClosingApps, which then are part of a transition.
It's questionable why this would need to happen, but we don't have
the risk budget to go down that rabbit hole.
Test: RemoteAnimationControllerTest
Test: Open Settings -> Network -> Wifi, press home, reopen
Settings, repeat 10x
Test: adb shell dumpsys window -a
Fixes:
76438155
Change-Id: Ib528d5c0d3559eb20522799af68ebbfb17b9801b
Adrian Roos [Tue, 27 Mar 2018 17:17:50 +0000 (19:17 +0200)]
DisplayCutout: Add clarifying images to LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
Fixes:
76462084
Test: make doc-comment-check-docs, open $ANDROID_BUILD_TOP/out/target/common/docs/doc-comment-check/reference/android/view/WindowManager.LayoutParams.html, navigate to LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
Change-Id: I8a9df979cbb062896fa874a163414a4f8a095b21
David Brazdil [Wed, 28 Mar 2018 10:15:08 +0000 (11:15 +0100)]
Add more uses on vendor hidden API list
These are from Pixel devices.
Bug:
64382372
Test: make
Change-Id: Ie8dab74299973f54472bf80c98bbc7496022874d
Mathew Inwood [Wed, 28 Mar 2018 12:01:37 +0000 (13:01 +0100)]
Use commas to separate API exemptions list, not colon.
A colon appears in the type signature of a field, so is not safe to use in
this context.
Test: m
Test: $ adb shell settings put global hidden_api_blacklist_exemptions \
Test: > Landroid/app/Activity;->mResumed:Z,Landroid/view/RemoteAnimationDefinition\\\;
Bug:
73337509
Change-Id: Ia9171fecc9c3ed265b87921b31458de25304486e
Nicolas Geoffray [Wed, 28 Mar 2018 11:26:46 +0000 (11:26 +0000)]
Merge "Add API to light grey." into pi-dev
am:
3e264bf0b8
Change-Id: I8de77af9b5029c845f25ea169027b045157153a3
Nicolas Geoffray [Wed, 28 Mar 2018 11:13:16 +0000 (11:13 +0000)]
Merge "Add API to light grey." into pi-dev
Lorenzo Colitti [Wed, 28 Mar 2018 10:46:54 +0000 (10:46 +0000)]
[automerger skipped] Merge "Allow third party cookies in the captive portal login app." am:
be6d45fe92
am:
b3673e9698 -s ours
Change-Id: If0558566613d55147e227936882335a3088036d4
Lorenzo Colitti [Wed, 28 Mar 2018 10:34:30 +0000 (10:34 +0000)]
Merge "Allow third party cookies in the captive portal login app."
am:
be6d45fe92
Change-Id: I5cb87e87aa64aebebfd9969dfb1ddbf02418b174
Jan Althaus [Fri, 23 Mar 2018 13:03:52 +0000 (14:03 +0100)]
Change TextClassification to use RemoteActions
Behavioural changes:
- Every action now as an icon, and instead hints via RemoteAction whether
the icon should be shown or not.
- Icons are now taken from the app default, not the activity.
(That way, we can construct a lightweight resource backed Icon)
- Legacy intents are no longer parceled for security reasons.
(TextClassificatio wasn't parcelable in O)
- TextClassifications built with the new API will always return null for
getIntent, but provide a getOnClickListener.
- Accessibility descriptions are now provided for action mode items.
Testing changes:
- Removed URI checks from TCM test because PendingIntent hides this info.
Bug:
73950205
Test: atest FrameworksCoreTests:TextClassificationManagerTest
Test: atest FrameworksCoreTests:TextClassificationTest
Test: atest CtsViewTestCases:TextClassificationManagerTest
Test: atest CtsViewTestCases:TextClassifierValueObjectsTest
Test: atest CtsWidgetTestCases:TextViewTest
Test: atest CtsWidgetTestCases:EditTextTest
Change-Id: I6706d2c342a8bbb9de0146a48c8b8aac9d9c7d83
Lorenzo Colitti [Wed, 28 Mar 2018 09:17:41 +0000 (09:17 +0000)]
Merge "Allow third party cookies in the captive portal login app."
Artem Iglikov [Wed, 28 Mar 2018 09:12:40 +0000 (09:12 +0000)]
Revert "Added safeguards for pushed brighntess curve."
This reverts commit
f1e673649e11b98f537489b7889f1d6efa6e7ff9.
Reason for revert: crashes system server
Bug:
77176207
Change-Id: I574e6e1f60d83f14701a643a1c7b8f7ef8659ed5
Narayan Kamath [Wed, 28 Mar 2018 09:02:51 +0000 (09:02 +0000)]
Merge "Build: Remove MIN_SUPPORTED_TARGET_SDK_INT from public API." into pi-dev
am:
77e0b7b821
Change-Id: I8380a14b0862a8ec36b880c4e851120aa62d58e0
Jaewan Kim [Wed, 28 Mar 2018 08:53:06 +0000 (08:53 +0000)]
Merge "MediaSessionService: Stop using APIs in the MediaComponents" into pi-dev
am:
9911073f6a
Change-Id: I40f7e09d5b3d2f30c44f510b3d0b490cd7abf10f
Narayan Kamath [Wed, 28 Mar 2018 08:43:08 +0000 (08:43 +0000)]
Merge "Build: Remove MIN_SUPPORTED_TARGET_SDK_INT from public API." into pi-dev
Andy Chou [Wed, 28 Mar 2018 08:40:41 +0000 (08:40 +0000)]
Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev
am:
a547a51818
Change-Id: Ib684023316d56af18066d1a9461630429fcb2afb
Jaewan Kim [Wed, 28 Mar 2018 08:40:23 +0000 (08:40 +0000)]
Merge "MediaSessionService: Stop using APIs in the MediaComponents" into pi-dev
Andy Chou [Wed, 28 Mar 2018 08:28:53 +0000 (08:28 +0000)]
Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev
Lucas Dupin [Wed, 28 Mar 2018 06:36:03 +0000 (06:36 +0000)]
Merge "Fix scrim animation when unlocking with fp" into pi-dev
am:
4f4d78b877
Change-Id: I71f9c9966f161afe179a24628935097174d9ca21
Jaewan Kim [Wed, 28 Mar 2018 03:19:04 +0000 (12:19 +0900)]
MediaSessionService: Stop using APIs in the MediaComponents
Bug:
76441725
Test: Build and run CtsMediaTestCases
Change-Id: I06f0b9c146869e16f730a6c78cf10fac691026c9
TreeHugger Robot [Wed, 28 Mar 2018 06:23:20 +0000 (06:23 +0000)]
Merge "Fix scrim animation when unlocking with fp" into pi-dev
Andreas Gampe [Wed, 28 Mar 2018 05:56:06 +0000 (05:56 +0000)]
[automerger skipped] Merge "BgDexopt: Reschedule job on timeout" into pi-dev
am:
f0edf03eda -s ours
Change-Id: Iebb0cbab80791fa15a2e40049ec8b6f40441d5be
Andreas Gampe [Wed, 28 Mar 2018 05:47:01 +0000 (05:47 +0000)]
Merge "BgDexopt: Reschedule job on timeout" into pi-dev
Pavel Maltsev [Wed, 28 Mar 2018 05:28:17 +0000 (05:28 +0000)]
Merge "Merge "Minor clean-up in NetworkCapabilities" am:
539f85a18d am:
b1e2bfe4df am:
8a956a5141" into pi-dev
am:
601861fd1c
Change-Id: I6605aad319ea268827f47d95fb6aef7c4c07ae93
Andreas Gampe [Wed, 28 Mar 2018 05:07:38 +0000 (05:07 +0000)]
Merge "BgDexopt: Reschedule job on timeout" am:
45bd60b4e2
am:
a4f14c5bff
Change-Id: Ie89209fdce23f878d6ebb315faa2a3bbaa67aef0
TreeHugger Robot [Wed, 28 Mar 2018 05:00:39 +0000 (05:00 +0000)]
Merge "Merge "Minor clean-up in NetworkCapabilities" am:
539f85a18d am:
b1e2bfe4df am:
8a956a5141" into pi-dev
Adam Newman [Wed, 28 Mar 2018 04:57:15 +0000 (04:57 +0000)]
Merge "Fix CaptivePortalLoginActivity null String crash" into pi-dev
am:
ace8e02633
Change-Id: I61e3a8f69d820348bc11d489ec4d927f54f3447f
Lucas Dupin [Wed, 28 Mar 2018 01:03:25 +0000 (18:03 -0700)]
Fix scrim animation when unlocking with fp
Notification panel expansion was overriding the animation.
The expansion needs to be ignored during "wake and unlock"
states.
Test: visual
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I781aece52c845f3fee9149c109ad598c7b555751
Fixes:
76018235
TreeHugger Robot [Wed, 28 Mar 2018 04:45:26 +0000 (04:45 +0000)]
Merge "Fix CaptivePortalLoginActivity null String crash" into pi-dev
Jiuyu Sun [Wed, 28 Mar 2018 04:37:53 +0000 (04:37 +0000)]
Merge "Address comments from API Review." into pi-dev
am:
a78a764fe3
Change-Id: I5aa5100fc837a813b8af60d26a05b29707aa5380
Svet Ganov [Wed, 28 Mar 2018 04:27:08 +0000 (04:27 +0000)]
Add API to query if a UID is active
am:
0c1c9cd7f2
Change-Id: Ic209da2a6817b82e7bcc09bd6eb2c0896a4071f5