OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Thu, 24 Aug 2017 16:12:45 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 7175b7b929  -s ours

Change-Id: I4be65bdb164ecf13c5d89316fb12d32ca69d8bb6

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 16:10:01 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "The VIS should return an AOHD regardless of keyphrase availability." into...
TreeHugger Robot [Thu, 24 Aug 2017 16:08:21 +0000 (16:08 +0000)]
Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 16:01:06 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev
Selim Cinek [Thu, 24 Aug 2017 16:00:20 +0000 (16:00 +0000)]
Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev

6 years agoMerge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev
Tyler Gunn [Thu, 24 Aug 2017 15:01:52 +0000 (15:01 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev

6 years agoMerge "Bluetooth: Add flag for human readable name" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 13:29:28 +0000 (13:29 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev

6 years agoMerge "Sleep activities with AOD" into oc-mr1-dev
Jorim Jaggi [Thu, 24 Aug 2017 13:19:42 +0000 (13:19 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 24 Aug 2017 12:11:32 +0000 (05:11 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I38d45e58136a2823cda74f3dbfb39c43b9ebe180

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 24 Aug 2017 11:18:53 +0000 (04:18 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ied6de9cbe69d8c72f9ba8c0095451a175f02d4dd

6 years agoMerge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 11:18:31 +0000 (11:18 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev

6 years agoMerge "Trivial change to test expectations." into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 10:55:20 +0000 (10:55 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev

6 years agoMerge "StringParceledListSlice throws exception when the IPC memory threshold is...
TreeHugger Robot [Thu, 24 Aug 2017 10:08:15 +0000 (10:08 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev

6 years agoBluetooth: Add flag for human readable name
Jack He [Mon, 24 Jul 2017 21:55:59 +0000 (14:55 -0700)]
Bluetooth: Add flag for human readable name

* Add hasHumanReadableName() method to CachedBluetoothDevice that
  returns True when BluetoothDevice.getAliasName() is not null nor empty

Bug: 34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: I197f3f7f3bcb7d785729473b25638006449ae862

6 years agoMerge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 08:34:39 +0000 (08:34 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 24 Aug 2017 07:54:49 +0000 (07:54 +0000)]
Import translations. DO NOT MERGE
am: b4f16b10af  -s ours

Change-Id: I458f0c75e3df2dccd9d622b4444c629ff7020f81

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 07:51:36 +0000 (07:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Move PiP state check exception to the client side" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 05:00:48 +0000 (05:00 +0000)]
Merge "Move PiP state check exception to the client side" into oc-mr1-dev

6 years agoMerge "Implement score cache eviction in AccessPoint." into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 04:50:47 +0000 (04:50 +0000)]
Merge "Implement score cache eviction in AccessPoint." into oc-mr1-dev

6 years agoMerge "Support l11n of Qualcomm® aptX™ strings" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 04:41:01 +0000 (04:41 +0000)]
Merge "Support l11n of Qualcomm® aptX™ strings" into oc-mr1-dev

6 years agoCachedBluetoothDevice: Rename mVisible to mJustDiscovered
Jack He [Mon, 24 Jul 2017 19:30:08 +0000 (12:30 -0700)]
CachedBluetoothDevice: Rename mVisible to mJustDiscovered

* CachedBluetoothDevice's member mVisible does not mean whether the
  device is visible. Instead, based on its current usage in the library,
  it indicates whether the device was just discovered by SettingsLib.
* Rename the field to mJustDiscovered and associated setters and
  getters.
* This paves way for future addition of mVisible to indicate whether the
  device should be visible to user in the UI.

Bug: 34685932
Test: build only, no functional changes
Change-Id: I616904e6d5bb27dbae74f94819eb0e8607a16e20

6 years agoTrivial change to test expectations.
Lorenzo Colitti [Thu, 24 Aug 2017 03:40:07 +0000 (12:40 +0900)]
Trivial change to test expectations.

Bug: 32163131
Test: runtest frameworks-net
Change-Id: Iea41c2b50502797f559afd09ded8cedf50dd7c05

6 years agoMerge "Fix issue with resizing background and incorrectly outline." into oc-mr1-dev
Winson Chung [Thu, 24 Aug 2017 03:23:43 +0000 (03:23 +0000)]
Merge "Fix issue with resizing background and incorrectly outline." into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 24 Aug 2017 03:13:10 +0000 (20:13 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ifc65484d51405de737a5b269fe6b6036638d0df1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 24 Aug 2017 03:01:50 +0000 (20:01 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ia19cd901c16c37d3053afc81aa47cf2dff5bbeea

6 years agoMerge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 01:39:10 +0000 (01:39 +0000)]
Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev

6 years agoMerge "DND footer doesn't stutter when exiting DND mode." into oc-mr1-dev
Beverly Tai [Thu, 24 Aug 2017 01:23:33 +0000 (01:23 +0000)]
Merge "DND footer doesn't stutter when exiting DND mode." into oc-mr1-dev

6 years agoMerge "Send add/removeDownstream info to offload HAL" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 01:09:57 +0000 (01:09 +0000)]
Merge "Send add/removeDownstream info to offload HAL" into oc-mr1-dev

6 years agoMerge "Generate fallback speed label in AccessPoint.java" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 23:43:16 +0000 (23:43 +0000)]
Merge "Generate fallback speed label in AccessPoint.java" into oc-mr1-dev

6 years agoMerge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 23:41:56 +0000 (23:41 +0000)]
Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev

6 years agoMerge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 23:15:59 +0000 (23:15 +0000)]
Merge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev

6 years agoMerge "Always use low-res tasksnapshots for low ram devices" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 23:01:53 +0000 (23:01 +0000)]
Merge "Always use low-res tasksnapshots for low ram devices" into oc-mr1-dev

6 years agoMerge "Use all certs for computing package signing sha256" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 22:51:41 +0000 (22:51 +0000)]
Merge "Use all certs for computing package signing sha256" into oc-mr1-dev

6 years agoMerge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev
Sudheer Shanka [Wed, 23 Aug 2017 22:26:08 +0000 (22:26 +0000)]
Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev

6 years agoFixed an issue where isFalseTouch could be queried
Selim Cinek [Wed, 23 Aug 2017 19:21:23 +0000 (12:21 -0700)]
Fixed an issue where isFalseTouch could be queried

We shouldn't forward any touches if we're not on the
lockscreen.

Test: drag down, turn of the screen
Change-Id: I90acdd7e57322227042b98741721fec977b80f97
Fixes: 63165400

6 years agoImplement score cache eviction in AccessPoint.
Sundeep Ghuman [Tue, 15 Aug 2017 22:47:18 +0000 (15:47 -0700)]
Implement score cache eviction in AccessPoint.

This prevents cached scores from being held indefinitely and used for
SSID fallback logic in WifiTracker (Picker).

Bug: 63073866
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Ib351d20db30dfd18b69bb1f8e4d4f26fc6b74ef0
Merged-In: Ib351d20db30dfd18b69bb1f8e4d4f26fc6b74ef0

6 years agoSend add/removeDownstream info to offload HAL
Erik Kline [Thu, 6 Jul 2017 10:49:35 +0000 (19:49 +0900)]
Send add/removeDownstream info to offload HAL

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passed
Bug: 29337859
Bug: 32163131

Change-Id: I6c59aa7cb80b54f376f294b24c1409710c553d74

6 years agoMove PiP state check exception to the client side
Winson Chung [Thu, 10 Aug 2017 22:57:18 +0000 (15:57 -0700)]
Move PiP state check exception to the client side

- When calling enterPictureInPictureMode(), the state of the activity in
  the client may be out of sync with the state of the activity in the
  system, causing an exception to be thrown erroneously. Instead, fail
  silently in the system if this occurs, and throw the exception in the
  client when it attempts to enter PiP from an invalid state.

Bug: 63753007
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ia99cc086805edc31f997d4325f7a5ccd7c85a77e

6 years agoSupport l11n of Qualcomm® aptX™ strings
Justin Klaassen [Wed, 23 Aug 2017 21:53:18 +0000 (14:53 -0700)]
Support l11n of Qualcomm® aptX™ strings

Bug: 63899732
Test: Verified strings in Settings > System > Developer Options.
Change-Id: Ib1fe508d65a670f1f461041afe0978ff641a993c

6 years agoMerge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev
George Mount [Wed, 23 Aug 2017 20:52:34 +0000 (20:52 +0000)]
Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev

6 years agoUse hardware bitmap for shared element snapshots.
George Mount [Tue, 22 Aug 2017 15:19:56 +0000 (08:19 -0700)]
Use hardware bitmap for shared element snapshots.

Bug: 64851247

Drawing to software bitmaps does not support many
features, most especially hardware bitmaps. This
changes the implementation to using hardware bitmaps
for View snapshots.

Also fixed broken TransitionTest discovered while
testing.

Test: I4ede02db67e578ea4a25069b683f1989c611e06c
Change-Id: I185bbfe1f789055c9efdba5297a74e481607afaf

6 years agoMerge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 20:40:42 +0000 (20:40 +0000)]
Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev

6 years agoMerge "power: throttle interaction hints" into oc-dev am: 78701217fd -s ours
Tim Murray [Wed, 23 Aug 2017 20:01:06 +0000 (20:01 +0000)]
Merge "power: throttle interaction hints" into oc-dev am: 78701217fd  -s ours
am: dd028e7c26

Change-Id: I1bcc02adcc7b74d63e09db1251b13c90630ef7a9

6 years agoMerge "power: throttle interaction hints" into oc-dev
Tim Murray [Wed, 23 Aug 2017 19:48:14 +0000 (19:48 +0000)]
Merge "power: throttle interaction hints" into oc-dev
am: 78701217fd  -s ours

Change-Id: I5135ddb75679ff6e4ffe5bb8daff97daf05deb34

6 years agoMerge "Remove string power_charging_duration_short" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Remove string power_charging_duration_short" into oc-mr1-dev

6 years agoMerge "power: throttle interaction hints" into oc-dev
TreeHugger Robot [Wed, 23 Aug 2017 19:25:47 +0000 (19:25 +0000)]
Merge "power: throttle interaction hints" into oc-dev

6 years agoMerge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 19:11:01 +0000 (19:11 +0000)]
Merge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev

6 years agoMerge "Add null check when ActivityRecord is refetched" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 18:58:09 +0000 (18:58 +0000)]
Merge "Add null check when ActivityRecord is refetched" into oc-mr1-dev

6 years agoUse all certs for computing package signing sha256
Svetoslav Ganov [Tue, 22 Aug 2017 21:35:04 +0000 (14:35 -0700)]
Use all certs for computing package signing sha256

In several places we compute the sha256 of the app's signing certificate
(instant cookie storage, backup account permission grants, static shared
lib matching). It is possible that an app is singed with multiple certs
which unfortunately can appear in a random order. We were using only the
first certificate to compute the hash which may be problematic for apps
signed with multiple certs which are later reordered. If an app update's
certs are reordered for cookie storage the app would not be able to
access the cookie, for account grants the app would not get the grant,
and for shared libs the app would fail to install due to a missing lib.

Test: all cookie CTS tests pass
      all static shared lib CTS tests pass
      added test that cookie data not lost on sha256 computation change
      added test that lib install works when specifying
      multiple certs

bug:64270295

Change-Id: Ib6b55f25da735ff5c2762faf6e9b5888e749041d

6 years agosounds : Add a makefile for Android Go specific sounds.
Narayan Kamath [Wed, 23 Aug 2017 18:35:28 +0000 (19:35 +0100)]
sounds : Add a makefile for Android Go specific sounds.

Bug: 64276740
Bug: 64542579
Test: make

Change-Id: I64e0bc8d4db5fafe0370977ccc8eb1c711aa5534

6 years agoChange KernelUidCpuFreqTimeReader Slog.wtf to Slog.e
Sudheer Shanka [Wed, 23 Aug 2017 18:29:23 +0000 (11:29 -0700)]
Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e

Bug: 63041570
Test: N/A
Change-Id: I2cb12f1b8f0333c4a000d601624dc95934cf9b90

6 years agoAlways use low-res tasksnapshots for low ram devices
Matthew Ng [Sat, 22 Jul 2017 00:27:42 +0000 (17:27 -0700)]
Always use low-res tasksnapshots for low ram devices

All snapshots are now stored using only the low resolution bitmaps
where all full size bitmaps are disabled to be written or loaded.

Bug: 62251652
Fixes: 63940837
Test: manual - open recents on low ram device to see if thumbnail is
there
Change-Id: I2128f0348cf71415721e73c730d3ed92e95d8144

6 years agoMerge "Track app visibility updates on the client" into oc-mr1-dev
Andrii Kulian [Wed, 23 Aug 2017 18:06:50 +0000 (18:06 +0000)]
Merge "Track app visibility updates on the client" into oc-mr1-dev

6 years agoWebView: clarify docs for addJavascriptInterface
Nate Fischer [Mon, 21 Aug 2017 19:03:58 +0000 (12:03 -0700)]
WebView: clarify docs for addJavascriptInterface

Docs change only, no change in logic.

We do not support calling #addJavascriptInterface until after JavaScript
is enabled via WebSettings#setJavaScriptEnabled. Calling these methods
in the wrong order is undefined behavior (and we've seen that it's buggy
under certain conditions, e.g. if the DOM includes an <img> element).

This clarifies the point in the docs and code example.

Bug: 64899039
Test: make -j40 docs (everything looks good)
Change-Id: I8ef9eec7f038037e6b898286e4dad8a57ecad472
(cherry picked from commit aaef6827ca26dee945ab0545671515ea8b4dbc23)

6 years agoMerge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 17:12:27 +0000 (17:12 +0000)]
Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev

6 years agoDND footer doesn't stutter when exiting DND mode.
Beverly [Wed, 23 Aug 2017 17:05:42 +0000 (13:05 -0400)]
DND footer doesn't stutter when exiting DND mode.

Change-Id: I3ce8dc51bda44a3121816232b758070f8f0dd1d7
Fixes: 64755310
Test: manual

6 years agoMerge "Check a11y enabled before sending events from PiP" into oc-mr1-dev
Phil Weaver [Wed, 23 Aug 2017 16:14:02 +0000 (16:14 +0000)]
Merge "Check a11y enabled before sending events from PiP" into oc-mr1-dev

6 years agoMerge "Transforming all texts of decorated media custom views" into oc-mr1-dev
Selim Cinek [Wed, 23 Aug 2017 15:55:41 +0000 (15:55 +0000)]
Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev

6 years agoMerge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev
Beverly Tai [Wed, 23 Aug 2017 15:50:30 +0000 (15:50 +0000)]
Merge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev

6 years agoAllow status_bar_height to be RRO controlled
Jason Monk [Wed, 23 Aug 2017 14:56:34 +0000 (10:56 -0400)]
Allow status_bar_height to be RRO controlled

Test: Boot device, see status bar
Bug: 64970608
Change-Id: I22e1131fbb98d89ce20e0862209d849ba3f16105

6 years agoSleep activities with AOD
Jorim Jaggi [Wed, 23 Aug 2017 14:14:10 +0000 (16:14 +0200)]
Sleep activities with AOD

Previously in the last release we started sleeping as soon as
the device was not interactive anymore. However, this caused
issues with ambiactive activites on Android Wear.

Instead, we introduce a new private flag on a window that signals
that all activities should be put to sleep. We use this flag in
SystemUI as soon as SystemUI is "dozing", which means its ambient
display is showing. This flag gets set before we request PWM to
wake-up, so it's ensured that this will not cause any spurious
lifecycle events.

Test: go/wm-smoke
Test: android.server.cts.KeyguardTests
Change-Id: I20f6dd4bfde220f945ef94d2ac1b89dd3694de32
Fixes: 64940094

6 years agoAOD: Fix crash when AOD is stopped immediately after starting
Adrian Roos [Tue, 22 Aug 2017 13:42:12 +0000 (15:42 +0200)]
AOD: Fix crash when AOD is stopped immediately after starting

Fixes an issue where the screen state was set after DozeService was already
destroyed, causing a crash.

Change-Id: I13ff590b62f905330ccb438692410e118b76c242
Fixes: 64907936
Test: runtest -x $ANDROID_BUILD_TOP/frameworks/base/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java

6 years agoMerge "Fix issue with app not becoming visible" into oc-mr1-dev
Jorim Jaggi [Wed, 23 Aug 2017 11:13:28 +0000 (11:13 +0000)]
Merge "Fix issue with app not becoming visible" into oc-mr1-dev

6 years agoFix issue with app not becoming visible
Jorim Jaggi [Tue, 22 Aug 2017 12:55:17 +0000 (14:55 +0200)]
Fix issue with app not becoming visible

If an activity was started on top of Keyguard but didn't have
FLAG_SHOW_WHEN_LOCKED set yet, topRunningActivityLocked was
the activity, so we called minimalResumeActivity with the activity
but the activity wasn't made visible because
checkKeyguardVisibility returned false. Then, r.visible was set
to true without actually informing window manager about the
visibility change, which wasn't corrected in
resumeTopActivityInnerLocked because r.visible was already set to
true.

Then, it's windows were stuck in READY_TO_SHOW state because the
token was never made visible.

Fix this by informing by informing WM about visibilility change in
completeResumeLocked. This is a no-op if visibility was already
correct.

I belive this regression was originally caused from
I745e985766a1af97203e1d22b6443dabdd0c0363

Test: go/wm-smoke
Test: Set dream from "Timely Alarm Clock", wait until dreaming,
then adb shell am start -n
ch.bitspin.timely/ch.bitspin.timely.activity.SnoozeActivity_

Change-Id: Idbd47086885c3536fa01ab249309ebe37203ba0b
Fixes: 62373472

6 years agoMerge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 10:07:39 +0000 (10:07 +0000)]
Merge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev

6 years agoStringParceledListSlice throws exception when the IPC memory threshold is exceeded
Alexandru-Andrei Rotaru [Fri, 18 Aug 2017 14:54:36 +0000 (15:54 +0100)]
StringParceledListSlice throws exception when the IPC memory threshold is exceeded

Fixed the code such that list of strings that exceed the 256KB limit can
be transfered.
Bug: 64833731
Test: Added unit test in ParceledListSliceTest

Change-Id: I4e16708010125a444baa8fcb0af6101dc643cd38
(cherry picked from commit 2682fa70678ec79131329a6071d70c3d84c23d41)

6 years agoMerge "Fix transitioning between non-accept strict policies." into oc-mr1-dev
Lorenzo Colitti [Wed, 23 Aug 2017 09:08:46 +0000 (09:08 +0000)]
Merge "Fix transitioning between non-accept strict policies." into oc-mr1-dev

6 years agoMerge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev
Lorenzo Colitti [Wed, 23 Aug 2017 05:46:34 +0000 (05:46 +0000)]
Merge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev

6 years agoMerge "Fixed a bug with app provided media spans" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 04:04:54 +0000 (04:04 +0000)]
Merge "Fixed a bug with app provided media spans" into oc-mr1-dev

6 years agoMerge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev
Daniel Colascione [Wed, 23 Aug 2017 03:45:14 +0000 (03:45 +0000)]
Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev

6 years agoTransforming all texts of decorated media custom views
Selim Cinek [Sat, 19 Aug 2017 01:53:44 +0000 (18:53 -0700)]
Transforming all texts of decorated media custom views

Since otherwise they would be illegible with the color
tranformation.

Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes: 64810767
Test: manual, add decoratedMediaCustomView

6 years agoMerge "Fix activity manager timeout during shutdown" into oc-mr1-dev
David Stevens [Wed, 23 Aug 2017 01:58:36 +0000 (01:58 +0000)]
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev

6 years agoMerge "make sure package info is non-null" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 01:51:12 +0000 (01:51 +0000)]
Merge "make sure package info is non-null" into oc-mr1-dev

6 years agoMerge "Only use WM screen rotation animation on default display" into oc-mr1-dev
David Stevens [Wed, 23 Aug 2017 01:28:20 +0000 (01:28 +0000)]
Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev

6 years agoMerge "Image: fix typo" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 00:20:12 +0000 (00:20 +0000)]
Merge "Image: fix typo" into oc-mr1-dev

6 years agoMerge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 23:54:18 +0000 (23:54 +0000)]
Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev

6 years agoFixed a bug with app provided media spans
Selim Cinek [Fri, 18 Aug 2017 23:17:51 +0000 (16:17 -0700)]
Fixed a bug with app provided media spans

Since notifications are colorized now,
We need to clear color spans from media
notifications, otherwise the contrast won't
be ensured.

Test: use media notification with color span, observe no span
Fixes: 64445955
Change-Id: Ib4f5b14196c604468c8c00ba48f294b1b2d102e3

6 years agoMerge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev
Selim Cinek [Tue, 22 Aug 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev

6 years agoMerge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev
Svetoslav Ganov [Tue, 22 Aug 2017 23:12:25 +0000 (23:12 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev

6 years agoFix activity manager timeout during shutdown
David Stevens [Thu, 17 Aug 2017 21:55:47 +0000 (14:55 -0700)]
Fix activity manager timeout during shutdown

Flip the return value for ActivityStack.goToSleepIfPossible from true if
something needs to be done to true if the stack successfully went to
sleep. An incorrect check in ActivityStack.checkReadyForSleep was
causing ActivityStackSupervisor to sometimes not get notified when a
stack finished stopping during shutdown. Also, no-delay calls to
ActivityStackSupervisor#checkReadyForSleepLocked would fail to put
activities to sleep.

BUG: 64756886
Test: go/run-boottest
Change-Id: Icec590ed9a0e0f035881b7eb03a280787dcfced1

6 years agoMerge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 23:01:21 +0000 (23:01 +0000)]
Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev

6 years agoMerge "Only log resolution when starting activities" into oc-mr1-dev
Todd Kennedy [Tue, 22 Aug 2017 23:00:58 +0000 (23:00 +0000)]
Merge "Only log resolution when starting activities" into oc-mr1-dev

6 years agoMerge "Allow clearing instant app meta-data" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:49:03 +0000 (22:49 +0000)]
Merge "Allow clearing instant app meta-data" into oc-mr1-dev

6 years agoMerge "Fixed a bug with decorated custom views" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:48:14 +0000 (22:48 +0000)]
Merge "Fixed a bug with decorated custom views" into oc-mr1-dev

6 years agoMerge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:42:57 +0000 (22:42 +0000)]
Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev

6 years agoMerge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc...
Nate Fischer [Tue, 22 Aug 2017 22:40:39 +0000 (22:40 +0000)]
Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev

6 years agoMerge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev
Lorenzo Colitti [Tue, 22 Aug 2017 22:06:46 +0000 (22:06 +0000)]
Merge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev

6 years agoFixed a bug where the colorization was lost when reinflating
Selim Cinek [Thu, 17 Aug 2017 23:42:51 +0000 (16:42 -0700)]
Fixed a bug where the colorization was lost when reinflating

Because we're reloading the drawable, it's colorfilter was lost.
Let's make sure we're reapplying any tints that we had when doing so.

Test: add colorized notification, reinflate
Change-Id: I11e59636317eb65da5573529f0dd44571ca10cce
Fixes: 63901744

6 years agoFixed a bug with decorated custom views
Selim Cinek [Thu, 17 Aug 2017 00:50:20 +0000 (17:50 -0700)]
Fixed a bug with decorated custom views

Even if their layout still maches, the content was unrecoverably
destroyed, so we can't just reapply it anymore.

Fixes: 62911941
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java

Change-Id: I3a50c96484686958570ac5e4949df3ad4b8a421a

6 years agomake sure package info is non-null
Todd Kennedy [Tue, 22 Aug 2017 17:48:18 +0000 (10:48 -0700)]
make sure package info is non-null

Change-Id: Ib867075a79712de36c46f862d13e5fc1d0958f00
Fixes: 64812776
Test: manual

6 years agoUse /proc/pid/smaps_rollup when available
Daniel Colascione [Thu, 27 Jul 2017 10:33:34 +0000 (03:33 -0700)]
Use /proc/pid/smaps_rollup when available

smaps_rollup saves CPU time by having the kernel sum smaps fields
before formatting each VMA's smaps; this way, user-space gets a single
dummy smaps entry with pre-summed fields, making it much less
expensive to measure PSS of large processes.

This change makes the Android framework attempt to use smaps_rollup
when available; we fall back to regular smaps when it isn't.

Test: pssbench; see log message about using smaps_rollup
Bug: 63439864
Change-Id: I66e207b02626e3287791e1348f35f58a8d94efe9

6 years agoMerge "Use the installer package name for broadcasts" into oc-mr1-dev
Todd Kennedy [Tue, 22 Aug 2017 20:27:12 +0000 (20:27 +0000)]
Merge "Use the installer package name for broadcasts" into oc-mr1-dev

6 years agoHides non-system overlays on USB debugging dialog.
Beverly [Tue, 22 Aug 2017 19:31:04 +0000 (15:31 -0400)]
Hides non-system overlays on USB debugging dialog.

This is necessary since some apps may use overlays that cannot be
seen. This prevents those overlays from preventing the USB dialog
from being accepted.

Bug: 62187985
Test: manual
Change-Id: Ic58ddd6d54e96f522445e67b90760dcfed13c27d

6 years agoAdd null check when ActivityRecord is refetched
Kevin Chyn [Tue, 22 Aug 2017 19:24:30 +0000 (12:24 -0700)]
Add null check when ActivityRecord is refetched

Fixes: 64937756

Test: nothing bad happens
Change-Id: Id88d8522586031dbe987d382ed859686bed05797

6 years agoAllow clearing instant app meta-data
Svet Ganov [Tue, 22 Aug 2017 19:15:58 +0000 (12:15 -0700)]
Allow clearing instant app meta-data

The package manager has an API to clear the data of an app
which does not work for uninstalled instant apps for which
we store some meta-data (icon, title, cookie). This change
allows clearing the data of an uninstalled instant app.

Test: Instant cookie CTS tests use this API

bug:64517837

Change-Id: Ia929fead71b5ae786e88ddd0fa8e8a490d970dd0

6 years agoVolume dialog touch-tracking is disabled when in zenMute.
Beverly [Tue, 22 Aug 2017 18:47:28 +0000 (14:47 -0400)]
Volume dialog touch-tracking is disabled when in zenMute.

When simultaneously touch-sliding the volume dialog and using phone's
volume buttons, volume dialog could get into a weird state
where the volume dialog still thinks their is touch input after
entering/exiting zenMute.  This resulted in volume changes when using
the phone volume buttons but no change in the volume dialog UI. To
prevent this, the dialog will ensure there is no touch tracking
when it's in zenMute mode.

Bug: 30746594
Test: manual
Change-Id: I8f16d017d8e37ec7ff2f16df8f4997f64484412e

6 years agoMerge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 19:12:17 +0000 (19:12 +0000)]
Merge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev

6 years agoMerge "Add trace counter for target screen brightness." into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 19:11:09 +0000 (19:11 +0000)]
Merge "Add trace counter for target screen brightness." into oc-mr1-dev

6 years agoAdd new telephony disconnect causes for low battery scenario.
Tyler Gunn [Tue, 22 Aug 2017 18:13:05 +0000 (11:13 -0700)]
Add new telephony disconnect causes for low battery scenario.

LOW_BATTERY is for disconnect mid-call due to low battery.
DIAL_LOW_BATTERY is for failure while dialing due to low battery.

Test: Manual.
Change-Id: Ife7a4ca5645b3fb42ab20effb4d8d4a8fef8116b
Fixes: 63936576

6 years agoMerge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev
Jorim Jaggi [Tue, 22 Aug 2017 18:05:02 +0000 (18:05 +0000)]
Merge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev