OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Show work notifications in the shade unless on keyguard." into pi-dev
Pavel Grafov [Thu, 5 Apr 2018 16:38:50 +0000 (09:38 -0700)]
Merge "Show work notifications in the shade unless on keyguard." into pi-dev
am: b175d0db8f

Change-Id: I4840f60d8b9f98dee3f02ed88fbfc6e47c64dad1

6 years agoMerge "[QS] Update landscape UI" into pi-dev
Rohan Shah [Thu, 5 Apr 2018 16:34:12 +0000 (09:34 -0700)]
Merge "[QS] Update landscape UI" into pi-dev
am: 044a5e17da

Change-Id: I49ab03325cdb483ee5372df4ee8042dc225df850

6 years agoMerge "Added adb commands to set and reset brightness." into pi-dev
Dan Gittik [Thu, 5 Apr 2018 16:27:10 +0000 (09:27 -0700)]
Merge "Added adb commands to set and reset brightness." into pi-dev
am: 0048eb210d

Change-Id: If2b04965975d6bbf8126f525d45ae0482dc33375

6 years agoMerge "Require screen to be unlocked for smart replies" into pi-dev
Milo Sredkov [Thu, 5 Apr 2018 16:20:00 +0000 (09:20 -0700)]
Merge "Require screen to be unlocked for smart replies" into pi-dev
am: 312a176a0b

Change-Id: I11d4eb66d036edb263717d21a3d4dde4047bb54b

6 years agoMerge "Show work notifications in the shade unless on keyguard." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 15:30:54 +0000 (15:30 +0000)]
Merge "Show work notifications in the shade unless on keyguard." into pi-dev

6 years agoMerge "[QS] Update landscape UI" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 15:29:27 +0000 (15:29 +0000)]
Merge "[QS] Update landscape UI" into pi-dev

6 years agoresolve merge conflicts of c8f5480981f987cb40989f387deeea360670f018 to pi-dev-plus...
Narayan Kamath [Thu, 5 Apr 2018 14:43:51 +0000 (15:43 +0100)]
resolve merge conflicts of c8f5480981f987cb40989f387deeea360670f018 to pi-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0aa2671c54b0af4a6104e52aea0b5474922042fe

6 years agoMerge "Added adb commands to set and reset brightness." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 14:43:32 +0000 (14:43 +0000)]
Merge "Added adb commands to set and reset brightness." into pi-dev

6 years agoMerge "Require screen to be unlocked for smart replies" into pi-dev
Milo Sredkov [Thu, 5 Apr 2018 14:07:52 +0000 (14:07 +0000)]
Merge "Require screen to be unlocked for smart replies" into pi-dev

6 years agoMerge "Add docs for setTargetSize and setTargetSampleSize" into pi-dev
Leon Scroggins [Thu, 5 Apr 2018 13:45:25 +0000 (06:45 -0700)]
Merge "Add docs for setTargetSize and setTargetSampleSize" into pi-dev
am: d9cb59629d

Change-Id: If2d4f604923ad74953733bb993420598c58e1e4b

6 years agoMerge "StrictMode: Add support for warning on non SDK API usage." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 13:41:17 +0000 (13:41 +0000)]
Merge "StrictMode: Add support for warning on non SDK API usage." into pi-dev

6 years agoMerge "Add docs for setTargetSize and setTargetSampleSize" into pi-dev
Leon Scroggins [Thu, 5 Apr 2018 13:29:38 +0000 (13:29 +0000)]
Merge "Add docs for setTargetSize and setTargetSampleSize" into pi-dev

6 years agoRequire screen to be unlocked for smart replies
Milo Sredkov [Wed, 4 Apr 2018 15:13:28 +0000 (16:13 +0100)]
Require screen to be unlocked for smart replies

Currently tapping on a smart reply works even when the screen is
locked. To make it consistent with inline replies, require the screen
to be unlocked before sending the reply.

Bug: 76217177
Test: atest SmartReplyViewTest
Change-Id: I3af8a0411537503650fb9f83cd99f65900e700e0

6 years agoAdded adb commands to set and reset brightness.
Dan Gittik [Wed, 28 Mar 2018 11:19:38 +0000 (12:19 +0100)]
Added adb commands to set and reset brightness.

adb shell cmd display set-brightness BRIGHTNESS command sets the
screen brightness programatically.
adb shell cmd display reset-brightness resets the brightness
configuration to the default configuration.

Test: run "adb shell cmd display set-brightness <number>" and watch
      the magic happen.

Test: run "adb shell cmd jobscheduler run -f
      com.google.android.apps.turbo 104" to push a new configuration,
      then run "adb shell cmd display reset-brightness-configuration"
      to reset it. If it's not noticable enough, you can manually
      edit /data/system/display-manager-state.xml: for example, set
      nits="0.0" for all the <brightness-point />s in the
      <brightness-curve /> to make it as dark as posible.

Fixes: 77574628

Change-Id: I37e19c1e662370e60c9f616a3710780f16418620

6 years agoMerge "Catch IAE from unbind onServiceDisconnected()" into pi-dev
Bernardo Rufino [Thu, 5 Apr 2018 11:38:46 +0000 (04:38 -0700)]
Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev
am: c83cf90166

Change-Id: I0fbb92d38a7e711e01dc9c0860e16ef4e102ce6e

6 years agoMerge "Catch IAE from unbind onServiceDisconnected()" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 11:26:25 +0000 (11:26 +0000)]
Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev

6 years agoMerge "Exempt platform-cert signed apps from hidden API checks." into pi-dev
Mathew Inwood [Thu, 5 Apr 2018 10:53:55 +0000 (03:53 -0700)]
Merge "Exempt platform-cert signed apps from hidden API checks." into pi-dev
am: 0e650c1c55

Change-Id: I79b6b7643f71928c65943744aa62b8a77d2749d1

6 years agoMerge "Exempt platform-cert signed apps from hidden API checks." into pi-dev
Mathew Inwood [Thu, 5 Apr 2018 10:43:12 +0000 (10:43 +0000)]
Merge "Exempt platform-cert signed apps from hidden API checks." into pi-dev

6 years agoMerge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into...
Jaewan Kim [Thu, 5 Apr 2018 10:16:05 +0000 (03:16 -0700)]
Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev
am: 8a585a6f1f

Change-Id: I87994559dedfd8049f4de72131ed5653bfa631ef

6 years agoCatch IAE from unbind onServiceDisconnected()
Bernardo Rufino [Thu, 5 Apr 2018 10:03:39 +0000 (11:03 +0100)]
Catch IAE from unbind onServiceDisconnected()

We still don't know the underlying cause of this, but we shouldn't crash
the system_server. Catching for now.

Bug: 74940472
Bug: 77574274
Test: m -j RunFrameworksServicesRoboTests
Change-Id: I36fc2e65f8766f6b8fd68104d8830b72668d84eb

6 years agoMerge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into...
TreeHugger Robot [Thu, 5 Apr 2018 10:03:22 +0000 (10:03 +0000)]
Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev

6 years agoMerge "Device ID attestation: Add feature flag." into pi-dev
Rubin Xu [Thu, 5 Apr 2018 09:54:53 +0000 (02:54 -0700)]
Merge "Device ID attestation: Add feature flag." into pi-dev
am: 73961397e5

Change-Id: I4488f26e579639a82ee9759e1202ec29add77245

6 years agoMerge "Device ID attestation: Add feature flag." into pi-dev
Rubin Xu [Thu, 5 Apr 2018 09:38:28 +0000 (09:38 +0000)]
Merge "Device ID attestation: Add feature flag." into pi-dev

6 years agoMerge "Don't call into phone process with lock held." into pi-dev
Makoto Onuki [Thu, 5 Apr 2018 07:39:07 +0000 (00:39 -0700)]
Merge "Don't call into phone process with lock held." into pi-dev
am: 4d289593f2

Change-Id: I66ba86186b67a18ddbfb7022a83c6fc979f080da

6 years agoMerge "Don't call into phone process with lock held." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 07:27:33 +0000 (07:27 +0000)]
Merge "Don't call into phone process with lock held." into pi-dev

6 years agoMerge "Use Collection instead of List for entity list" into pi-dev
Richard Ledley [Thu, 5 Apr 2018 05:58:17 +0000 (22:58 -0700)]
Merge "Use Collection instead of List for entity list" into pi-dev
am: 7b7e87eeb5

Change-Id: Ifac9afa0240c95134021a04bfb358f610a1cf073

6 years agoMerge "Use Collection instead of List for entity list" into pi-dev
Richard Ledley [Thu, 5 Apr 2018 05:46:53 +0000 (05:46 +0000)]
Merge "Use Collection instead of List for entity list" into pi-dev

6 years agoMerge "MediaSessionManager: Apply API council review" into pi-dev
Jaewan Kim [Thu, 5 Apr 2018 05:42:12 +0000 (22:42 -0700)]
Merge "MediaSessionManager: Apply API council review" into pi-dev
am: 628f59aa45

Change-Id: Ia9b5171cd720f87842bbc95ab318d199ffa35e8f

6 years agoMerge "MediaSessionManager: Apply API council review" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 05:25:15 +0000 (05:25 +0000)]
Merge "MediaSessionManager: Apply API council review" into pi-dev

6 years agoPersist volume level on reconnections for Hearing Aid
Jakub Pawlowski [Thu, 5 Apr 2018 05:10:12 +0000 (22:10 -0700)]
Persist volume level on reconnections for Hearing Aid
am: c274fb2d22

Change-Id: Ie41328cc89e3deb81dbafd453093cfe6be18c5cd

6 years agoPersist volume level on reconnections for Hearing Aid
Jakub Pawlowski [Wed, 4 Apr 2018 17:15:12 +0000 (10:15 -0700)]
Persist volume level on reconnections for Hearing Aid

Devices in mFullVolumeDevices have volume level reset to maximum value
in checkFixedVolumeDevices.

Bug: 69623109
Test: change Hearing Aid volume, restart phone, verify volume persisted
Change-Id: Iba134c0b3dc959c19c59f89c3d4ac02eed1e216f

6 years agoMerge "Fade scrims slower when entering AOD" into pi-dev
Lucas Dupin [Thu, 5 Apr 2018 04:43:43 +0000 (21:43 -0700)]
Merge "Fade scrims slower when entering AOD" into pi-dev
am: 6a95a2cc52

Change-Id: I3789bf84c4aae8d9b598c2ef0a9b6909f61af420

6 years agoMerge "Fade scrims slower when entering AOD" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 04:26:50 +0000 (04:26 +0000)]
Merge "Fade scrims slower when entering AOD" into pi-dev

6 years agoMerge "Fix image fetching." into pi-dev
Tomasz Wasilczyk [Thu, 5 Apr 2018 03:30:41 +0000 (20:30 -0700)]
Merge "Fix image fetching." into pi-dev
am: 7f0afb4958

Change-Id: I0f6df8908c939bf41ebaa9f8204ce961eff1b78e

6 years agoMerge "Fix image fetching." into pi-dev
Tomasz Wasilczyk [Thu, 5 Apr 2018 03:14:14 +0000 (03:14 +0000)]
Merge "Fix image fetching." into pi-dev

6 years agoMerge "Ensure we mark windows as not seamlessly rotating when removing them." into...
Robert Carr [Thu, 5 Apr 2018 02:37:51 +0000 (19:37 -0700)]
Merge "Ensure we mark windows as not seamlessly rotating when removing them." into pi-dev
am: c4a5f78b16

Change-Id: Ic543818a39411b3b270cb76c1aecff0b2f1c32d9

6 years agoMerge "Ensure we mark windows as not seamlessly rotating when removing them." into...
TreeHugger Robot [Thu, 5 Apr 2018 02:29:14 +0000 (02:29 +0000)]
Merge "Ensure we mark windows as not seamlessly rotating when removing them." into pi-dev

6 years agoMediaController: Fix annotation of Callback#onPlaybackStateChanged()
Jaewan Kim [Thu, 5 Apr 2018 02:13:38 +0000 (11:13 +0900)]
MediaController: Fix annotation of Callback#onPlaybackStateChanged()

PlaybackState can be null and it's annotated as @Nullable in other
places. So we'd better to fix the annotation.

Bug: 77532207
Test: Run CtsMediaTestCases
Change-Id: I8974c6c99d9d188934f74775977631fb7b37e5d2

6 years agoMerge "Load static RROs in OverlayManagerService" into pi-dev
Jaekyun Seok [Thu, 5 Apr 2018 01:55:57 +0000 (18:55 -0700)]
Merge "Load static RROs in OverlayManagerService" into pi-dev
am: 743d42d299

Change-Id: I151823d6aa87f98d096f85119feb9b810ab62e2f

6 years agoMerge "Load static RROs in OverlayManagerService" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 01:41:39 +0000 (01:41 +0000)]
Merge "Load static RROs in OverlayManagerService" into pi-dev

6 years agoMerge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev
Allen Webb [Thu, 5 Apr 2018 01:13:06 +0000 (18:13 -0700)]
Merge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev
am: aa5c335a60

Change-Id: Ib60b57350bd8447b9b4d7bb4b56e3f5b7aadf857

6 years agoMerge "Add NtpTimeHelper" into pi-dev
Yu-Han Yang [Thu, 5 Apr 2018 01:07:21 +0000 (18:07 -0700)]
Merge "Add NtpTimeHelper" into pi-dev
am: 93a10eb1d2

Change-Id: I06ec09f1976e91e5efcb00ca5062be67e20b35b1

6 years agoMerge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 00:58:18 +0000 (00:58 +0000)]
Merge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev

6 years agoMerge "Merge "Remove duplicate definitions of utility variables" am: 8d5a39ac62 am...
Android Build Merger (Role) [Thu, 5 Apr 2018 00:58:10 +0000 (00:58 +0000)]
Merge "Merge "Remove duplicate definitions of utility variables" am: 8d5a39ac62 am: 9473e846e5" into pi-dev-plus-aosp

6 years agoMerge "Shelf horizontal alignment was a few dps off" into pi-dev
Lucas Dupin [Thu, 5 Apr 2018 00:57:47 +0000 (17:57 -0700)]
Merge "Shelf horizontal alignment was a few dps off" into pi-dev
am: f6486683fa

Change-Id: I3c3752cf60ae3a5a5bbe3e8d4f947081da8671f7

6 years agoMerge "Remove duplicate definitions of utility variables" am: 8d5a39ac62
Dan Willemsen [Thu, 5 Apr 2018 00:56:57 +0000 (17:56 -0700)]
Merge "Remove duplicate definitions of utility variables" am: 8d5a39ac62
am: 9473e846e5

Change-Id: Ie52855316907746a6347fcc6b343f5c75d9c9c64

6 years agoMerge "Fix app switch regression" into pi-dev
Winson Chung [Thu, 5 Apr 2018 00:52:31 +0000 (17:52 -0700)]
Merge "Fix app switch regression" into pi-dev
am: 1ecd7aa188

Change-Id: Ia326259ea6a41cb32362d3f60db746216faca2d1

6 years agoMerge "Add NtpTimeHelper" into pi-dev
Yu-Han Yang [Thu, 5 Apr 2018 00:51:32 +0000 (00:51 +0000)]
Merge "Add NtpTimeHelper" into pi-dev

6 years agoMerge "Remove duplicate definitions of utility variables"
Dan Willemsen [Thu, 5 Apr 2018 00:46:12 +0000 (17:46 -0700)]
Merge "Remove duplicate definitions of utility variables"
am: 8d5a39ac62

Change-Id: I38a6dff84d3ccad0a1b895a4416b14e59c406953

6 years agoMerge "WM Tests: Use a separate WindowManager instance per test" into pi-dev
Adrian Roos [Thu, 5 Apr 2018 00:46:10 +0000 (17:46 -0700)]
Merge "WM Tests: Use a separate WindowManager instance per test" into pi-dev
am: 71c632367a

Change-Id: Ib27bd64528218cf826a3a674efad863e3cdc6555

6 years agoFade scrims slower when entering AOD
Lucas Dupin [Wed, 4 Apr 2018 22:09:06 +0000 (15:09 -0700)]
Fade scrims slower when entering AOD

Test: visual
Change-Id: I32117a6351c3d652f845b1b46bffaade52f1fbc4
Fixes: 77539750

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 5 Apr 2018 00:36:26 +0000 (17:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 0df72e4065  -s ours

Change-Id: Ia1a574e12e57f2a2bc4eeb80fc443278f4b12bc3

6 years agoMerge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev
Ryan Mitchell [Thu, 5 Apr 2018 00:34:32 +0000 (17:34 -0700)]
Merge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev
am: 6a23deef5d

Change-Id: Iec9bec5ba7f58c5ef5ef283bac16e2a1d6ebee6d

6 years agoMerge "Shelf horizontal alignment was a few dps off" into pi-dev
Lucas Dupin [Thu, 5 Apr 2018 00:33:45 +0000 (00:33 +0000)]
Merge "Shelf horizontal alignment was a few dps off" into pi-dev

6 years agoMerge "Fix app switch regression" into pi-dev
Winson Chung [Thu, 5 Apr 2018 00:33:07 +0000 (00:33 +0000)]
Merge "Fix app switch regression" into pi-dev

6 years agoMerge "Puts back res id to correct view for the pinning tutorial" into pi-dev
Matthew Ng [Thu, 5 Apr 2018 00:30:01 +0000 (17:30 -0700)]
Merge "Puts back res id to correct view for the pinning tutorial" into pi-dev
am: 1d513fc5d0

Change-Id: I1479abf7c8a139060c0780e138726ad02e6d5d8f

6 years agoMerge "WM Tests: Use a separate WindowManager instance per test" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 00:25:34 +0000 (00:25 +0000)]
Merge "WM Tests: Use a separate WindowManager instance per test" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 00:16:29 +0000 (00:16 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev
Ryan Mitchell [Thu, 5 Apr 2018 00:14:38 +0000 (00:14 +0000)]
Merge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev

6 years agoMerge "Puts back res id to correct view for the pinning tutorial" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 00:11:21 +0000 (00:11 +0000)]
Merge "Puts back res id to correct view for the pinning tutorial" into pi-dev

6 years agoMerge "Add Polish keycharactermap" am: 3b5016598d
Siarhei Vishniakou [Thu, 5 Apr 2018 00:09:17 +0000 (17:09 -0700)]
Merge "Add Polish keycharactermap" am: 3b5016598d
am: f9d6ac81a4

Change-Id: If8bd6fa07b8b7bef2e97541a9a41ff9269fd649f

6 years agoMerge "Hearing Aid: change get/set active device (3/3)" am: a23007dd54
Hansong Zhang [Thu, 5 Apr 2018 00:03:26 +0000 (17:03 -0700)]
Merge "Hearing Aid: change get/set active device (3/3)" am: a23007dd54
am: 29e1c0e494

Change-Id: I62e456026531bc8921990c713595907f6f48fcf4

6 years agoMerge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev
Jean-Michel Trivi [Wed, 4 Apr 2018 23:57:17 +0000 (16:57 -0700)]
Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev
am: 57e4156ee3

Change-Id: Ic0c6ef0355ed2d07d7810ddc800f926bfec77f81

6 years agoMerge "Add Polish keycharactermap"
Siarhei Vishniakou [Wed, 4 Apr 2018 23:56:02 +0000 (16:56 -0700)]
Merge "Add Polish keycharactermap"
am: 3b5016598d

Change-Id: I554316c67876f27c8a55c351d7192eea4bb1c524

6 years agoMerge "Completely fill in permission info" into pi-dev
Todd Kennedy [Wed, 4 Apr 2018 23:52:40 +0000 (16:52 -0700)]
Merge "Completely fill in permission info" into pi-dev
am: fdc891e2af

Change-Id: Iff6c239001686f523bbb89aeeeae572fab32bce0

6 years agoMerge "Hearing Aid: change get/set active device (3/3)"
Hansong Zhang [Wed, 4 Apr 2018 23:50:40 +0000 (16:50 -0700)]
Merge "Hearing Aid: change get/set active device (3/3)"
am: a23007dd54

Change-Id: I0760912dd11edf7f3db443d663644b0ceb415f0e

6 years agoMerge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev
Jean-Michel Trivi [Wed, 4 Apr 2018 23:40:35 +0000 (23:40 +0000)]
Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev

6 years agoMerge "Completely fill in permission info" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 23:39:39 +0000 (23:39 +0000)]
Merge "Completely fill in permission info" into pi-dev

6 years agoMerge "Adding a utility method to show Assist session" into pi-dev
Sunny Goyal [Wed, 4 Apr 2018 23:26:38 +0000 (16:26 -0700)]
Merge "Adding a utility method to show Assist session" into pi-dev
am: 53a77b615c

Change-Id: If3e72ce3887792e85a13f138de7c21991bfc635c

6 years agoMerge "Allow double tap when pulsing" into pi-dev
Lucas Dupin [Wed, 4 Apr 2018 23:14:40 +0000 (16:14 -0700)]
Merge "Allow double tap when pulsing" into pi-dev
am: f6f68802c9

Change-Id: I54ab15e11085b57aebba651d3c7e4ee18836758c

6 years agoMerge "Hiding windows for suspended packages" into pi-dev
Suprabh Shukla [Wed, 4 Apr 2018 23:08:37 +0000 (16:08 -0700)]
Merge "Hiding windows for suspended packages" into pi-dev
am: fe99686d8a

Change-Id: I5b8d2cf4fc1b4e5bcccf85b2411a8deefe0ee7dc

6 years agoMerge "Adding a utility method to show Assist session" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 23:05:41 +0000 (23:05 +0000)]
Merge "Adding a utility method to show Assist session" into pi-dev

6 years agoMerge "Remove duplicate definitions of utility variables"
Treehugger Robot [Wed, 4 Apr 2018 23:04:08 +0000 (23:04 +0000)]
Merge "Remove duplicate definitions of utility variables"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 4 Apr 2018 23:00:04 +0000 (16:00 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I32c2b02c473f73f279bea8631709bab73090d1c2

6 years agoMerge "Update for sdk drop" into pi-dev
Jeff Gaston [Wed, 4 Apr 2018 22:58:05 +0000 (15:58 -0700)]
Merge "Update for sdk drop" into pi-dev
am: 71436c639a

Change-Id: I4485b4e775ff34ed383428f9f96de114c36c824f

6 years agoLoad static RROs in OverlayManagerService
Jaekyun Seok [Wed, 4 Apr 2018 02:28:21 +0000 (11:28 +0900)]
Load static RROs in OverlayManagerService

Only RROs targeting "android" are loaded from AssetManager, and so
others should be loaded from OverlayManagerService.

The RROs targeting "android" would be ingored as they are to avoid
redundant loading.

Bug: 76205654
Test: succeeded building and tested with taimen
Change-Id: Ibeeb3c3f3338a845b2f4c485305636003d9dbd44

6 years agoMerge "Allow double tap when pulsing" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 22:48:22 +0000 (22:48 +0000)]
Merge "Allow double tap when pulsing" into pi-dev

6 years agoMerge "Hiding windows for suspended packages" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 22:42:37 +0000 (22:42 +0000)]
Merge "Hiding windows for suspended packages" into pi-dev

6 years agoMerge "Update for sdk drop" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 22:40:27 +0000 (22:40 +0000)]
Merge "Update for sdk drop" into pi-dev

6 years agoMerge "autofill: fix window location in splitwindow and dialog" into pi-dev
Dake Gu [Wed, 4 Apr 2018 22:32:21 +0000 (15:32 -0700)]
Merge "autofill: fix window location in splitwindow and dialog" into pi-dev
am: 2b26f83f12

Change-Id: I9cc1549f891bed04a5e367b19466769be35762ba

6 years agoDon't call into phone process with lock held.
Makoto Onuki [Wed, 4 Apr 2018 22:29:00 +0000 (15:29 -0700)]
Don't call into phone process with lock held.

Bug: 77456094
Fixes: 77456094

Test: Manual test:
- Insert SIM card to device
- Set break point to setNetworkTemplateEnabledInner
- Change connectivity and make sure setNetworkTemplateEnabledInner()
is called with right arguments.

Change-Id: I6ff3c5639b48cb95419b431a85c498e214ee8e0d

6 years agoMerge "Statsd config TTL" into pi-dev
Yangster-mac [Wed, 4 Apr 2018 22:27:09 +0000 (15:27 -0700)]
Merge "Statsd config TTL" into pi-dev
am: 48920ab48d

Change-Id: I2b06fd144ed95ff2dc1df09a906b073d856a063d

6 years agoMerge "Add basic inversion lock detection to DPMS." into pi-dev
Makoto Onuki [Wed, 4 Apr 2018 22:16:16 +0000 (15:16 -0700)]
Merge "Add basic inversion lock detection to DPMS." into pi-dev
am: d421e0ffdf

Change-Id: I480e170a69a5c194004b0d3746ff930da82dde59

6 years agoMerge "Add Polish keycharactermap"
Treehugger Robot [Wed, 4 Apr 2018 22:10:19 +0000 (22:10 +0000)]
Merge "Add Polish keycharactermap"

6 years agoMerge "autofill: fix window location in splitwindow and dialog" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 22:06:49 +0000 (22:06 +0000)]
Merge "autofill: fix window location in splitwindow and dialog" into pi-dev

6 years agoMerge "Fix launcher apps reverse access" into pi-dev
Makoto Onuki [Wed, 4 Apr 2018 22:04:59 +0000 (15:04 -0700)]
Merge "Fix launcher apps reverse access" into pi-dev
am: 1fe71e24c8

Change-Id: I50c303ce9d8bcbb831d7d5dee28b31ff26d2c7bf

6 years agoMerge "Statsd config TTL" into pi-dev
TreeHugger Robot [Wed, 4 Apr 2018 22:01:55 +0000 (22:01 +0000)]
Merge "Statsd config TTL" into pi-dev

6 years agoCompletely fill in permission info
Todd Kennedy [Wed, 4 Apr 2018 22:00:00 +0000 (15:00 -0700)]
Completely fill in permission info

During the refactor, an optimization was made to generatePermissionInfo()
to avoid creating duplicate PermissionInfo objects. However, the logic was
flawed and if a permission's protection level was ever adjusted, we
wouldn't return a properly filled out PermissionInfo object.

Change-Id: I70b3eda199008807182f75a413651d7cb4f4b7fd
Fixes: 74556457
Test: Manual; run app com.kakao.taxi and it doesn't crash

6 years agoMerge "Added --debug-mode flag to AAPT2" into pi-dev
Ryan Mitchell [Wed, 4 Apr 2018 21:59:47 +0000 (14:59 -0700)]
Merge "Added --debug-mode flag to AAPT2" into pi-dev
am: 498baa82e6

Change-Id: I212efa4392f4da28817f88d589f865d17495f17c

6 years agoMerge "Add basic inversion lock detection to DPMS." into pi-dev
Makoto Onuki [Wed, 4 Apr 2018 21:54:11 +0000 (21:54 +0000)]
Merge "Add basic inversion lock detection to DPMS." into pi-dev

6 years agoMerge "Added decoding of truncated AAPT string lengths." into pi-dev
Ryan Mitchell [Wed, 4 Apr 2018 21:53:04 +0000 (14:53 -0700)]
Merge "Added decoding of truncated AAPT string lengths." into pi-dev
am: 49668cd130

Change-Id: I18281fb6fd4f32ade20442b31b8af020070d2f24

6 years agoMerge "Fixed resource bag retrieval infinite recursion." into pi-dev
Ryan Mitchell [Wed, 4 Apr 2018 21:46:55 +0000 (14:46 -0700)]
Merge "Fixed resource bag retrieval infinite recursion." into pi-dev
am: 1f76cbd738

Change-Id: I0dd918f8cbf2541d70c754fc859675949a2814b7

6 years agoShelf horizontal alignment was a few dps off
Lucas Dupin [Wed, 4 Apr 2018 21:32:53 +0000 (14:32 -0700)]
Shelf horizontal alignment was a few dps off

Also interpolating anti burn in offset instead of setting it.

Test: visual
Change-Id: Ib9248a89eaf8a8905f8d462cb8ded574975372a7
Fixes: 77541088

6 years agoMerge "Hearing Aid: change get/set active device (3/3)"
Treehugger Robot [Wed, 4 Apr 2018 21:42:17 +0000 (21:42 +0000)]
Merge "Hearing Aid: change get/set active device (3/3)"

6 years agoAdding a utility method to show Assist session
Sunny Goyal [Wed, 4 Apr 2018 21:41:07 +0000 (14:41 -0700)]
Adding a utility method to show Assist session

Bug: 72122079
Test: Verified the library works with launcher
Change-Id: Ic1e9131687ea85fdcce16c71054ce7940c190504

6 years agoPuts back res id to correct view for the pinning tutorial
Matthew Ng [Wed, 4 Apr 2018 21:33:00 +0000 (14:33 -0700)]
Puts back res id to correct view for the pinning tutorial

Put the wrong back button id for pinning tutorial in landscape
and now corrected it.

Test: manual - use 3 button nav bar, rotate to landscape and pin
Change-Id: I7cb2d61356226b11e7aa9b777e86badbf83a1f63
Fixes: 74174603

6 years agoMerge "Simplify service wrapper initialization + make robust" into pi-dev
Makoto Onuki [Wed, 4 Apr 2018 21:36:31 +0000 (14:36 -0700)]
Merge "Simplify service wrapper initialization + make robust" into pi-dev
am: 291988ef59

Change-Id: Iaf87a5cf7f9bc3a949c55e8ca0f3eb91aebcbb24

6 years agoMerge "Fix launcher apps reverse access" into pi-dev
Makoto Onuki [Wed, 4 Apr 2018 21:29:38 +0000 (21:29 +0000)]
Merge "Fix launcher apps reverse access" into pi-dev

6 years agoMerge "Fixed IMMS.DebugFlag#refresh() default value" into pi-dev
Tarandeep Singh [Wed, 4 Apr 2018 21:26:02 +0000 (14:26 -0700)]
Merge "Fixed IMMS.DebugFlag#refresh() default value" into pi-dev
am: 6dd11b53e2

Change-Id: Ib2ee4399c9d0f0892e3c0894e245db96d6496e33

6 years agoMerge "Added --debug-mode flag to AAPT2" into pi-dev
Ryan Mitchell [Wed, 4 Apr 2018 21:21:28 +0000 (21:21 +0000)]
Merge "Added --debug-mode flag to AAPT2" into pi-dev