OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "[QS] Fix irritating animation for QS"
TreeHugger Robot [Tue, 30 Jan 2018 01:00:18 +0000 (01:00 +0000)]
Merge "[QS] Fix irritating animation for QS"

6 years agoMerge "Remove SystemApi annotation from EuiccManager.getOtaStatus()" am: 67fb5370cd...
Holly Jiuyu Sun [Tue, 30 Jan 2018 00:37:28 +0000 (00:37 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()" am: 67fb5370cd am: bded9f969f
am: a8a0683a96

Change-Id: I3e60bad4c8c7c305c29dd2a5d996572360aa3db7

6 years agoMerge "Remove SystemApi annotation from EuiccManager.getOtaStatus()" am: 67fb5370cd
Holly Jiuyu Sun [Tue, 30 Jan 2018 00:28:21 +0000 (00:28 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()" am: 67fb5370cd
am: bded9f969f

Change-Id: I704a78ae7330d1eefcfcecb6dfb8073d71cfe5ed

6 years agoMerge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
Holly Jiuyu Sun [Tue, 30 Jan 2018 00:20:46 +0000 (00:20 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
am: 67fb5370cd

Change-Id: I784ea684fa99ef0dc6ed56ddff966669fbaddd49

6 years agoMerge "Added animations to dim layers"
Chavi Weingarten [Tue, 30 Jan 2018 00:19:27 +0000 (00:19 +0000)]
Merge "Added animations to dim layers"

6 years agoMerge "Update MediaControlView2/Provider"
TreeHugger Robot [Tue, 30 Jan 2018 00:15:14 +0000 (00:15 +0000)]
Merge "Update MediaControlView2/Provider"

6 years agoMerge "Revert "Security model for moving sharesheet to systemui""
Alison Cichowlas [Tue, 30 Jan 2018 00:00:10 +0000 (00:00 +0000)]
Merge "Revert "Security model for moving sharesheet to systemui""

6 years agoMerge "change bluetooth update to be cumulative value based"
Chenjie Yu [Mon, 29 Jan 2018 23:51:08 +0000 (23:51 +0000)]
Merge "change bluetooth update to be cumulative value based"

6 years agoMerge "Added a timeout to the launch animation"
Selim Cinek [Mon, 29 Jan 2018 23:49:18 +0000 (23:49 +0000)]
Merge "Added a timeout to the launch animation"

6 years agoMerge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
Holly Jiuyu Sun [Mon, 29 Jan 2018 23:47:11 +0000 (23:47 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"

6 years agoMerge "Set display id on stack creation"
TreeHugger Robot [Mon, 29 Jan 2018 23:34:09 +0000 (23:34 +0000)]
Merge "Set display id on stack creation"

6 years agoMerge "Split usage_in_bytes into following separate fields:"
Rajeev Kumar [Mon, 29 Jan 2018 23:26:08 +0000 (23:26 +0000)]
Merge "Split usage_in_bytes into following separate fields:"

6 years agoMerge "Remove security_v2 flag"
TreeHugger Robot [Mon, 29 Jan 2018 23:25:09 +0000 (23:25 +0000)]
Merge "Remove security_v2 flag"

6 years agoMerge "Remove aggressive handover APIs part 1"
TreeHugger Robot [Mon, 29 Jan 2018 23:17:37 +0000 (23:17 +0000)]
Merge "Remove aggressive handover APIs part 1"

6 years agoMerge "Add "Unlocked device required" parameter to keys"
TreeHugger Robot [Mon, 29 Jan 2018 23:16:02 +0000 (23:16 +0000)]
Merge "Add "Unlocked device required" parameter to keys"

6 years agoUpdate MediaControlView2/Provider
Jin Seok Park [Mon, 29 Jan 2018 05:49:41 +0000 (14:49 +0900)]
Update MediaControlView2/Provider

This CL does the following 5 things:

1) REMOVE setPrevNextListener API
2) REMOVE show/hideSubtitle API
3) EXPOSE Command related strings as public
4) CHANGE time parameter in show(timeout) from integer to long
5) CHANGE setButtonVisibility(visible) parameter from boolean to int

All changes are based on API review.

Test: build
Change-Id: Ia6ffb454100be6a2f75a145e9d6a87bd88faac0c

6 years agoMerge "PinnerService: output total pinned size"
TreeHugger Robot [Mon, 29 Jan 2018 22:52:24 +0000 (22:52 +0000)]
Merge "PinnerService: output total pinned size"

6 years agoMerge "Remove double cache eviction logic."
TreeHugger Robot [Mon, 29 Jan 2018 22:40:43 +0000 (22:40 +0000)]
Merge "Remove double cache eviction logic."

6 years agoMerge "MediaPlayer2: allow multiple EventCallback's"
TreeHugger Robot [Mon, 29 Jan 2018 22:22:30 +0000 (22:22 +0000)]
Merge "MediaPlayer2: allow multiple EventCallback's"

6 years agoMerge "More gracefully handle client death"
TreeHugger Robot [Mon, 29 Jan 2018 22:18:37 +0000 (22:18 +0000)]
Merge "More gracefully handle client death"

6 years agoMerge "If nothing to animate, don't call remote animator"
Jorim Jaggi [Mon, 29 Jan 2018 22:13:53 +0000 (22:13 +0000)]
Merge "If nothing to animate, don't call remote animator"

6 years agoMerge "Add a DPM api to check if a pkg is restricted to use metered data."
Sudheer Shanka [Mon, 29 Jan 2018 22:01:35 +0000 (22:01 +0000)]
Merge "Add a DPM api to check if a pkg is restricted to use metered data."

6 years agoMore gracefully handle client death
Jason Monk [Mon, 29 Jan 2018 19:09:36 +0000 (14:09 -0500)]
More gracefully handle client death

 - Don't crash
 - Don't listen

Test: runtest --path frameworks/base/services/tests/uiservicestests
Change-Id: I31f526a566d6d11a1a53948a58c5dad51dbe1b17
Fixes: 72540922

6 years agoMerge "Add support for external volume handler of volume adjustements"
Jean-Michel Trivi [Mon, 29 Jan 2018 21:58:51 +0000 (21:58 +0000)]
Merge "Add support for external volume handler of volume adjustements"

6 years agoAdded a timeout to the launch animation
Selim Cinek [Mon, 29 Jan 2018 20:40:32 +0000 (12:40 -0800)]
Added a timeout to the launch animation

After the timeout was hit, we stop blocking touches.

Bug: 69168591
Test: launch notification from service
Change-Id: I6bbb0d603631164cefdbadf0eb9d92af0aaeb84e

6 years agoMerge "Differentiate SystemUISharedLib library vs apk"
Dan Willemsen [Mon, 29 Jan 2018 21:40:13 +0000 (21:40 +0000)]
Merge "Differentiate SystemUISharedLib library vs apk"

6 years agoRevert "Security model for moving sharesheet to systemui"
Alison Cichowlas [Mon, 29 Jan 2018 21:34:33 +0000 (16:34 -0500)]
Revert "Security model for moving sharesheet to systemui"

This reverts commit 88f3d4dbe1dbc08316d8a9e25edce1ad16fe2eab.

Bug: 72554856
Test: repro instructions in bug

6 years agoMerge "Clean up MediaMetadataRetriever use"
TreeHugger Robot [Mon, 29 Jan 2018 21:33:20 +0000 (21:33 +0000)]
Merge "Clean up MediaMetadataRetriever use"

6 years agoSet display id on stack creation
Andrii Kulian [Fri, 26 Jan 2018 00:39:27 +0000 (16:39 -0800)]
Set display id on stack creation

Set stack display id before setting activity and window type,
because it might accidentally change multi-window mode of a
default display.

Bug: 72048469
Bug: 70564344
Bug: 68952181
Test: ActivityManagerMultiDisplayTests
Change-Id: I5f550bcdfb82f5e615eeeaa7c02efe9a4edad643

6 years agoMerge "Docs: Changed "the value of an item that previously added with putExtra()...
Jon Dormody [Mon, 29 Jan 2018 21:24:26 +0000 (21:24 +0000)]
Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev am: 0704571547
am: 43a77db029

Change-Id: I0372e97637de2416386ac45dc383b82ddb4a1991

6 years agoMerge "Keep track of battery drain rate in various states..."
TreeHugger Robot [Mon, 29 Jan 2018 21:21:25 +0000 (21:21 +0000)]
Merge "Keep track of battery drain rate in various states..."

6 years agoRemove aggressive handover APIs part 1
Ningyuan Wang [Mon, 22 Jan 2018 23:28:35 +0000 (15:28 -0800)]
Remove aggressive handover APIs part 1

Bug: 27877641
Test: compile, unit tests
Change-Id: Ib291988a43d7eb5495fbb42624b434fe799044ab

6 years agoAdded animations to dim layers
chaviw [Sat, 20 Jan 2018 01:09:15 +0000 (17:09 -0800)]
Added animations to dim layers

Added animations to dim layers when dims are set for
WindowState surfaces since they're controlled by the system.

Test: Dims for dialogs now animate.
Test: DimmerTests
Fixes: 71841698
Fixes: 69553362
Fixes: 71614627
Fixes: 72333587

Change-Id: I34f6f3d7885d5c9c0075a941e40d68bc5618a016

6 years agoMerge "Docs: Changed "the value of an item that previously added with putExtra()...
Jon Dormody [Mon, 29 Jan 2018 21:15:04 +0000 (21:15 +0000)]
Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev
am: 0704571547

Change-Id: Ib9702cb1707ba756ea3202e0fdde579f5c493866

6 years agoMerge "Fix battery background color in QS"
TreeHugger Robot [Mon, 29 Jan 2018 21:14:40 +0000 (21:14 +0000)]
Merge "Fix battery background color in QS"

6 years agoMerge "PackageSignatures: bring back tag skipping on unknown element."
TreeHugger Robot [Mon, 29 Jan 2018 21:13:44 +0000 (21:13 +0000)]
Merge "PackageSignatures: bring back tag skipping on unknown element."

6 years agoRemove SystemApi annotation from EuiccManager.getOtaStatus()
Jiyong Park [Mon, 8 Jan 2018 05:08:17 +0000 (14:08 +0900)]
Remove SystemApi annotation from EuiccManager.getOtaStatus()

EuiccManager.getOtaStatus() has been annotated as @SystemApi, but its
declaring class EuiccManager has not. Therefore, the method hasn't been
recognized as SystemApi (does not appear in system-current.txt) and no
app is using the method.

This hasn't been harmful, but will soon trigger CTS failures when we do
the exact match for SystemAPIs; a runtime entity annotated as @SystemApi
have to exist in the documented API (e.g. system-current.txt). So
removing this no-op annotation.

Bug: 67891551
Test: m -j checkapi
Change-Id: I570ef5e5c88b6b9162116d3d3a7b17367efa9d7f

6 years agoMerge "Docs: Changed "the value of an item that previously added with putExtra()...
Jon Dormody [Mon, 29 Jan 2018 21:04:50 +0000 (21:04 +0000)]
Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev

6 years ago[QS] Fix irritating animation for QS
Rohan Shah [Fri, 26 Jan 2018 02:22:44 +0000 (18:22 -0800)]
[QS] Fix irritating animation for QS

We're animating 2x the icons and, due to the transparent grey
background color, it looked like the icons were getting darker.

Fixed by having it exclude the full icon frame while animating.

Test: Visually
Bug: 72173914
Change-Id: Ie36973ab44a86e6e1edd99b9266420a274d9aaa2

6 years agoMerge "Defer surface layouts during recents animation setup/cleanup"
Winson Chung [Mon, 29 Jan 2018 20:08:06 +0000 (20:08 +0000)]
Merge "Defer surface layouts during recents animation setup/cleanup"

6 years agoMerge "@FastNative for CursorWindow"
Chris Craik [Mon, 29 Jan 2018 20:07:44 +0000 (20:07 +0000)]
Merge "@FastNative for CursorWindow"

6 years agoRemove security_v2 flag
Fan Zhang [Mon, 29 Jan 2018 19:59:43 +0000 (11:59 -0800)]
Remove security_v2 flag

Change-Id: Ibac46b9df4b950bfdbf1adf16ae65dc9b11d0dbf
Fixes: 32953042
Test: rebuild

6 years agoMerge "Merge "Docs: Inserting a line to include the documentation for keyPreviewHeigh...
Android Build Merger (Role) [Mon, 29 Jan 2018 19:53:33 +0000 (19:53 +0000)]
Merge "Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev am: 7b3c924114 am: afb592c4bf"

6 years agoMerge "Docs: Inserting a line to include the documentation for keyPreviewHeight....
Jon Dormody [Mon, 29 Jan 2018 19:52:56 +0000 (19:52 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev am: 7b3c924114
am: afb592c4bf

Change-Id: I2276021c9c2ae453add4e139b677dcfe7e71facd

6 years agoMerge "Temporary Threshold for Binder Proxy Tracking"
TreeHugger Robot [Mon, 29 Jan 2018 19:52:26 +0000 (19:52 +0000)]
Merge "Temporary Threshold for Binder Proxy Tracking"

6 years agoMerge "Docs: Added a link to the Motion Sensor docs for information on gravity values...
Jon Dormody [Mon, 29 Jan 2018 19:48:52 +0000 (19:48 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug: 6442659" into oc-mr1-dev am: 04d261f309
am: 0762440a7a

Change-Id: I70244cbf5790189959373d1e71ac18a988a399be

6 years agoMerge "Docs: Inserting a line to include the documentation for keyPreviewHeight....
Jon Dormody [Mon, 29 Jan 2018 19:40:10 +0000 (19:40 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev
am: 7b3c924114

Change-Id: I8a010a0b326f58a5c3e1d0b86f4990123cd67307

6 years agoMerge "Make device owner user command foreground"
TreeHugger Robot [Mon, 29 Jan 2018 19:36:47 +0000 (19:36 +0000)]
Merge "Make device owner user command foreground"

6 years agoMerge "Docs: Added a link to the Motion Sensor docs for information on gravity values...
Jon Dormody [Mon, 29 Jan 2018 19:34:59 +0000 (19:34 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug: 6442659" into oc-mr1-dev
am: 04d261f309

Change-Id: I15d0773c820591f153c67382b8826131eb88f98a

6 years agoMerge "Introduce MeasuredText related perf tests"
TreeHugger Robot [Mon, 29 Jan 2018 19:30:42 +0000 (19:30 +0000)]
Merge "Introduce MeasuredText related perf tests"

6 years agoAdd a DPM api to check if a pkg is restricted to use metered data.
Sudheer Shanka [Tue, 23 Jan 2018 23:15:03 +0000 (15:15 -0800)]
Add a DPM api to check if a pkg is restricted to use metered data.

We need this so that Settings can check if an app is
restricted by admin from using metered data.

Bug: 63700027
Test: manual
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: I9a2ea9c458b0f10a3c3c6edcbe82da9eccaa51c3

6 years agoMerge "Docs: Inserting a line to include the documentation for keyPreviewHeight....
Jon Dormody [Mon, 29 Jan 2018 19:23:32 +0000 (19:23 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev

6 years agoMerge "Docs: Added a link to the Motion Sensor docs for information on gravity values...
Jon Dormody [Mon, 29 Jan 2018 19:23:15 +0000 (19:23 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug: 6442659" into oc-mr1-dev

6 years agoMediaPlayer2: allow multiple EventCallback's
Wei Jia [Fri, 26 Jan 2018 20:40:47 +0000 (12:40 -0800)]
MediaPlayer2: allow multiple EventCallback's

Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: Ie1be29c10d73126d9ebdad8358110ba507a034d5

6 years agoMerge "Fix JNI abort due to mismatched critical get/release call."
TreeHugger Robot [Mon, 29 Jan 2018 19:15:07 +0000 (19:15 +0000)]
Merge "Fix JNI abort due to mismatched critical get/release call."

6 years agoMerge "Make all unchooseable orientations update rotation on change"
Mike Digman [Mon, 29 Jan 2018 19:14:52 +0000 (19:14 +0000)]
Merge "Make all unchooseable orientations update rotation on change"

6 years agoFix battery background color in QS
Evan Laird [Mon, 29 Jan 2018 19:08:45 +0000 (14:08 -0500)]
Fix battery background color in QS

Battery was only getting a foreground color, not background. Fix by
using the SystemUI context so it finds the correct light colors for both
foregorund and background.

Test: visual with light wallpaper
Change-Id: I6e18ce9331a5e78241d8c24ba96a8b843c646813
Fixes: 72431673

6 years agoKeep track of battery drain rate in various states...
Makoto Onuki [Fri, 26 Jan 2018 18:26:36 +0000 (10:26 -0800)]
Keep track of battery drain rate in various states...

... and print in dumpsys power.

Bug: 72229630
Test: manual test with dumpsys power, etc
Test:  atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java

Change-Id: I43949129ff03c1e0b0fa3aa603e0678b728538ee

6 years agoSplit usage_in_bytes into following separate fields:
Rajeev Kumar [Mon, 29 Jan 2018 19:06:48 +0000 (11:06 -0800)]
Split usage_in_bytes into following separate fields:

  1. rss_in_bytes
  2. cache_in_bytes
  3. swap_in_bytes

See: go/android-p-memory-metrics

Bug: 72177881
Test: Manual
Change-Id: I8d88aa24aac500b9e5cb4e40b9af9dab3af7113b

6 years agoMerge "Adds generic intent Instant App resolution"
TreeHugger Robot [Mon, 29 Jan 2018 18:43:46 +0000 (18:43 +0000)]
Merge "Adds generic intent Instant App resolution"

6 years agoMerge "Log additional events in security log."
Pavel Grafov [Mon, 29 Jan 2018 18:41:41 +0000 (18:41 +0000)]
Merge "Log additional events in security log."

6 years agoMerge "Minor fixes on URI permission methods."
TreeHugger Robot [Mon, 29 Jan 2018 18:36:48 +0000 (18:36 +0000)]
Merge "Minor fixes on URI permission methods."

6 years agoMerge "Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406...
Android Build Merger (Role) [Mon, 29 Jan 2018 18:33:15 +0000 (18:33 +0000)]
Merge "Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406 am: 626f665a65 am: 8142017f62"

6 years agoMerge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406 am:...
Ruchi Kandoi [Mon, 29 Jan 2018 18:32:53 +0000 (18:32 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406 am: 626f665a65
am: 8142017f62

Change-Id: I7ef07b3aa3a59f510a7a5e897d134707c04f675b

6 years agoMerge "Add more statsd's debugging info to dumpsys."
Yao Chen [Mon, 29 Jan 2018 18:32:45 +0000 (18:32 +0000)]
Merge "Add more statsd's debugging info to dumpsys."

6 years agoMerge "Add slice subtype constants for sliders/progress."
TreeHugger Robot [Mon, 29 Jan 2018 18:31:57 +0000 (18:31 +0000)]
Merge "Add slice subtype constants for sliders/progress."

6 years agoMerge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406
Ruchi Kandoi [Mon, 29 Jan 2018 18:25:10 +0000 (18:25 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406
am: 626f665a65

Change-Id: I562b46b71416406e2640fc84f7b6a064327a7ca8

6 years agoMerge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
Ruchi Kandoi [Mon, 29 Jan 2018 18:18:11 +0000 (18:18 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
am: ac2247c406

Change-Id: I6592686f765e3474d1c02bf9b3bc243ab152b641

6 years agoIf nothing to animate, don't call remote animator
Jorim Jaggi [Thu, 25 Jan 2018 14:06:13 +0000 (15:06 +0100)]
If nothing to animate, don't call remote animator

Otherwise we'll end up with weird transitions when just switching
focus because focus switch causes an app transition to run.

Test: go/wm-smoke
Test: Enter PIP, click on PIP window, click on launcher window
to execute an empty app transition.

Change-Id: Ie42ad808ff4d4646570c122fd3b964e3255a57bc

6 years agoAdd "Unlocked device required" parameter to keys
Brian C. Young [Thu, 16 Nov 2017 23:36:43 +0000 (15:36 -0800)]
Add "Unlocked device required" parameter to keys

Add a keymaster parameter for keys that should be inaccessible when
the device screen is locked. "Locked" here is a state where the device
can be used or accessed without any further trust factor such as a
PIN, password, fingerprint, or trusted face or voice.

This parameter is added to the Java keystore interface for key
creation and import, as well as enums specified by and for the native
keystore process.

Test: go/asym-write-test-plan

Bug: 67752510

Change-Id: I8b88ff8fceeafe14e7613776c9cf5427752d9172

6 years agoMerge "Defer cross profile animation is the activity is intercepted ... for work...
TreeHugger Robot [Mon, 29 Jan 2018 18:12:24 +0000 (18:12 +0000)]
Merge "Defer cross profile animation is the activity is intercepted ... for work mode / work challenge"

6 years agoMerge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
Treehugger Robot [Mon, 29 Jan 2018 17:59:23 +0000 (17:59 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"

6 years agoDefer surface layouts during recents animation setup/cleanup
Winson Chung [Fri, 26 Jan 2018 18:04:20 +0000 (10:04 -0800)]
Defer surface layouts during recents animation setup/cleanup

Bug: 72550644
Test: Swipe up with suitable launcher build check systrace
Change-Id: Idf5ff8bd60250176a60b84b7f29604ac9882b493

6 years agoMerge "Fix issue with flickering with recents animation"
Jorim Jaggi [Mon, 29 Jan 2018 17:41:16 +0000 (17:41 +0000)]
Merge "Fix issue with flickering with recents animation"

6 years agoAdd support for external volume handler of volume adjustements
Jean-Michel Trivi [Sat, 27 Jan 2018 23:42:42 +0000 (15:42 -0800)]
Add support for external volume handler of volume adjustements

For devices that use the config_handleVolumeKeysInWindowManager
  configuration, add API to receive volume key-related events
  directly, without them being processed by the framework
  (already not received by apps).

Bug: b/63906162
Test: set config_handleVolumeKeysInWindowManager, use
    "adb shell dumpsys audio" to verify adjustVolume methods aren't
    logged

Change-Id: I432b14fa9980764d69077b9f1b23b8c95f30814d

6 years agoMerge "Re-initialize the brightness slider when out of sync."
TreeHugger Robot [Mon, 29 Jan 2018 17:28:26 +0000 (17:28 +0000)]
Merge "Re-initialize the brightness slider when out of sync."

6 years agoMerge "Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member am: f8f6d0a8ec...
Android Build Merger (Role) [Mon, 29 Jan 2018 17:20:56 +0000 (17:20 +0000)]
Merge "Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member am: f8f6d0a8ec am: 753f325909"

6 years agoDocs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member am: f8f6d0a8ec
Ricardo Loo Foronda [Mon, 29 Jan 2018 17:20:29 +0000 (17:20 +0000)]
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member am: f8f6d0a8ec
am: 753f325909

Change-Id: Ib6fb6b03669f789a9b0c9dc789cfb371ce1350c4

6 years agoMerge "Update adb backup/restore confirmation activity on new intent"
Annie Meng [Mon, 29 Jan 2018 17:20:09 +0000 (17:20 +0000)]
Merge "Update adb backup/restore confirmation activity on new intent"

6 years agoMerge "Lock screen message alignment"
Lucas Dupin [Mon, 29 Jan 2018 17:15:09 +0000 (17:15 +0000)]
Merge "Lock screen message alignment"

6 years agoDocs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
Ricardo Loo Foronda [Mon, 29 Jan 2018 17:12:00 +0000 (17:12 +0000)]
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
am: f8f6d0a8ec

Change-Id: I8aabec3ac04c0a732efe705919f53a3cadd8c63a

6 years agoMerge "Reduce pss collection amount, improve logging."
TreeHugger Robot [Mon, 29 Jan 2018 16:52:08 +0000 (16:52 +0000)]
Merge "Reduce pss collection amount, improve logging."

6 years agoMerge changes I423d6df4,I7b8a079b
Winson Chung [Mon, 29 Jan 2018 16:51:16 +0000 (16:51 +0000)]
Merge changes I423d6df4,I7b8a079b

* changes:
  Piping animation signal to onboarding.
  Expose call to start screen pinning on a task.

6 years agoLog additional events in security log.
Pavel Grafov [Wed, 10 Jan 2018 17:14:11 +0000 (17:14 +0000)]
Log additional events in security log.

These events are required for US NIAP MDFPP v3.1 compliance.

Bug: 70886042
Test: manual
Change-Id: I1752469cf4c7ff499eb4356fa1c94f3146d4c9b8

6 years agoAdds generic intent Instant App resolution
Patrick Baumann [Mon, 8 Jan 2018 19:23:38 +0000 (11:23 -0800)]
Adds generic intent Instant App resolution

Bug: 63117034
Change-Id: Ie3818e913e8e1077f60434a626bc606c0b5015ab
Test: Manual using test app at google_experimental/users/patb/InstantAppsInP
Test: atest android.appsecurity.cts.EphemeralTest passes after modification

6 years agoMerge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71 am: 38cbc885d1
Jason Monk [Mon, 29 Jan 2018 16:15:42 +0000 (16:15 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71 am: 38cbc885d1
am: 0b922f2dd8

Change-Id: Idae1cdbac391e00e4e2f623017b343ec9de9cb44

6 years agoPackageSignatures: bring back tag skipping on unknown element.
Dan Cashman [Mon, 29 Jan 2018 16:07:27 +0000 (08:07 -0800)]
PackageSignatures: bring back tag skipping on unknown element.

Commit: 7ee17aa6b228a007129147c7a6e9ecba2a40d892 moved the
skipCurrentTag call when reading certs into the branch directly
dealing with <cert /> tags to eliminate issues for the <pastSigs />
tag, but in doing so will cause bad parses when encountering unknown
elements.  Restore the previous behavior when an unknown tag is
encountered.

Bug: 64686581
Test: Builds, boots.
Change-Id: I3e2850b3dc1660ca43b7b5d01bf345290d11bac0

6 years agoMerge "Control hidden API toast with a system property" am: 13020490be am: a9b3f91828
David Brazdil [Mon, 29 Jan 2018 16:07:23 +0000 (16:07 +0000)]
Merge "Control hidden API toast with a system property" am: 13020490be am: a9b3f91828
am: 1e1c4fc802

Change-Id: I0b2d898dbdac8ed6ac8995bab521b62adb5d0f2e

6 years agoMerge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71
Jason Monk [Mon, 29 Jan 2018 16:06:51 +0000 (16:06 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71
am: 38cbc885d1

Change-Id: I3ebdf0ad481dcf9e6ec2d12151d591a24c40458a

6 years agoMerge "Control hidden API toast with a system property" am: 13020490be
David Brazdil [Mon, 29 Jan 2018 15:59:49 +0000 (15:59 +0000)]
Merge "Control hidden API toast with a system property" am: 13020490be
am: a9b3f91828

Change-Id: Iac1fdeff968b131e8f3486060dfb7cdeed446157

6 years agoMerge "Fix nav keys being tiny on sw600dp devices"
Jason Monk [Mon, 29 Jan 2018 15:56:06 +0000 (15:56 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
am: a20239bf71

Change-Id: I30fbb071d290ff8477560f25216dd1ea04c789a6

6 years agoMerge "Control hidden API toast with a system property"
David Brazdil [Mon, 29 Jan 2018 15:52:46 +0000 (15:52 +0000)]
Merge "Control hidden API toast with a system property"
am: 13020490be

Change-Id: Ib390fd568e4a5d71cdceec3a84b0d55e02b9c45d

6 years agoMerge "Alarms and Media visibly muted in PriorityOnly dnd"
TreeHugger Robot [Mon, 29 Jan 2018 15:45:39 +0000 (15:45 +0000)]
Merge "Alarms and Media visibly muted in PriorityOnly dnd"

6 years agoMerge "MediaSession2/Controller2: Add playlist support"
TreeHugger Robot [Mon, 29 Jan 2018 15:43:19 +0000 (15:43 +0000)]
Merge "MediaSession2/Controller2: Add playlist support"

6 years agoMerge "Remove return value in clearApplicationUserData"
TreeHugger Robot [Mon, 29 Jan 2018 15:41:28 +0000 (15:41 +0000)]
Merge "Remove return value in clearApplicationUserData"

6 years agoMerge changes from topics "sessiontoken2_simpl", "move_binder2", "mediaitem2_updatabl...
TreeHugger Robot [Mon, 29 Jan 2018 15:29:33 +0000 (15:29 +0000)]
Merge changes from topics "sessiontoken2_simpl", "move_binder2", "mediaitem2_updatable", "session2_sendcustomcommand"

* changes:
  MediaSession2: Simplify constructor of SessionToken2
  MediaSession2: Move binder interfaces into the updatable
  MediaSession2: Move MediaItem2 to updatable
  MediaSession2: Implements sendCustomCommand()

6 years agoMerge "readCertsListXml: fix IndexOutofBoundsException and erroneous skip."
TreeHugger Robot [Mon, 29 Jan 2018 15:25:08 +0000 (15:25 +0000)]
Merge "readCertsListXml: fix IndexOutofBoundsException and erroneous skip."

6 years agoMerge "Do not propagate parent bound changes from task as onResize."
Bryce Lee [Mon, 29 Jan 2018 15:24:58 +0000 (15:24 +0000)]
Merge "Do not propagate parent bound changes from task as onResize."

6 years agoMerge "Enable IP callback for Network Watchlist"
Ricky Wai [Mon, 29 Jan 2018 15:24:29 +0000 (15:24 +0000)]
Merge "Enable IP callback for Network Watchlist"

6 years agoRe-initialize the brightness slider when out of sync.
Michael Wright [Mon, 29 Jan 2018 15:17:20 +0000 (15:17 +0000)]
Re-initialize the brightness slider when out of sync.

Whenever the brightness controller stops listening to brightness events,
it could get out of sync and so will animate when next opened and it
re-registers. We want to avoid this animation since it looks odd to the
user so we always re-initialize whenever we might get out of sync.

Bug: 72635553
Test: manual
Change-Id: I3a7e05e18652af33511a5de5a8ebeee01d2f0349