Commit Graph

246497 Commits

Author SHA1 Message Date
Chris Craik
92529363d0 Merge "Reset transparent region when saving a surface" into nyc-dev
am: 52b952a296

* commit '52b952a296b84283db9041de96e2ff408b221572':
  Reset transparent region when saving a surface

Change-Id: Ida763eab76b258a5f454aa4249cbd7ce3a02c81a
2016-05-07 00:02:50 +00:00
TreeHugger Robot
dce92891df Merge "Fix minimized state messup" into nyc-dev 2016-05-06 23:58:28 +00:00
TreeHugger Robot
52b952a296 Merge "Reset transparent region when saving a surface" into nyc-dev 2016-05-06 23:42:34 +00:00
Felipe Leme
87d20317bf Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev
am: 638a6e8140

* commit '638a6e8140a22a0ddb5d5dacb02173795073bd1a':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: I5d3fdbbff6d92be9657d3ed466462ca911d20881
2016-05-06 23:39:09 +00:00
TreeHugger Robot
638a6e8140 Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev 2016-05-06 23:25:30 +00:00
Svetoslav Ganov
9c67138250 Merge "Properly map runtime permissions to app ops" into nyc-dev
am: ba83e90e18

* commit 'ba83e90e1825f3e40a16370babc83b8ac0645cf9':
  Properly map runtime permissions to app ops

Change-Id: Ie4830b140c2589abecbe8e6f575ab939d9c988ce
2016-05-06 23:17:52 +00:00
Svetoslav Ganov
ba83e90e18 Merge "Properly map runtime permissions to app ops" into nyc-dev 2016-05-06 23:08:31 +00:00
Andrii Kulian
530cc7abc8 Merge "Fix onStop not called when activity is under translucent" into nyc-dev
am: a5aa3ecbe3

* commit 'a5aa3ecbe3426b44b6d550624e7b30f4b84c1025':
  Fix onStop not called when activity is under translucent

Change-Id: I863e28ef8884e3c6e629c1b2c30c554fb0538988
2016-05-06 22:52:44 +00:00
Jorim Jaggi
817a52441f Fix minimized state messup
We didn't dispatch the change, but still set the field. This lead to
issues where SysUI disagreed on the minimized state. To fix this, we
only check for state changes if the docked stack is visible, but then
dispatch the change always.

Bug: 28445644
Change-Id: Ie460135049c78e11c97f3160994ca4069bf82e6c
2016-05-06 15:45:00 -07:00
Andrii Kulian
a5aa3ecbe3 Merge "Fix onStop not called when activity is under translucent" into nyc-dev 2016-05-06 22:44:19 +00:00
Steve McKay
391d3d5b5e Merge "Don\'t persist selection after restore." into nyc-dev
am: 522a437786

* commit '522a4377863339d9486c833f5a39f8047576bfee':
  Don't persist selection after restore.

Change-Id: Idee08d4397212a2a2a58b650ebcaa3b162b73aab
2016-05-06 22:22:41 +00:00
Chris Craik
3131bdec70 Reset transparent region when saving a surface
Fixes: 28432088

Ensure a transparent region on a saved surface is reset for future use,
since the surface should be like-new if used again.

This prevents an issue where the region - used to signal a portion of
content doesn't need to be composited - is persisted when a saved
surface is reused. The client assumes it's new and in default
state (composite everything), but the window is clipped when composited.

Change-Id: Icf2ec94c735679d715aded58de7eab12e9c43367
2016-05-06 15:11:27 -07:00
TreeHugger Robot
522a437786 Merge "Don't persist selection after restore." into nyc-dev 2016-05-06 22:11:14 +00:00
Felipe Leme
0da215640f Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev
am: de66540fd3

* commit 'de66540fd3f73937c3cfbe1d50e575aa69acc474':
  Refactored NetworkPolicyManagerService mUidRules.

Change-Id: I89af2823e8d791a487917daafe16be6764c231b2
2016-05-06 21:53:54 +00:00
Felipe Leme
d31a97fd83 Fixed connectivity state in some restricted network scenarios.
NetworkPolicyManagerService (NMPS) keeps an internal list of uid
rules (mUidRules) for network restrictions, and when these rules
changes it needs to notify external listeners (such as
ConnectivityService / CS).

Prior to Android N, both Data Saver mode (the feature previously known
as "Restrict Baground Data") and Battery Save mode used the same set of
firewall rules to implement their restrictions: when Battery Saver mode
NPMS would mark all networks as metered and set the proper firewall
rules externally.

Recently, these 2 modes were split in 2 distinct firewall rules and
NMPS.updateRuleForRestrictBackgroundLocked() was changed to update
the mUidRules logic based on the Data Saver firewall (since the Battery
Saver firewall changes are handled externally, on
updateRuleForRestrictPowerLocked()). As such, CS was not notified when
the power-related changes were made, which would cause apps to get a
state of CONNECTED / CONNECTED when querying its active connection.

Another scenario that is not properly handled is when a UID whitelisted
for Data Saver is brought back to foreground: although the proper
firewall rules are set, CS is not notified, and the apps state would be
DISCONNECTED / BLOCKED.

This CL introduces many changes that fix this issue:

- Fixed updateRuleForRestrictBackgroundLocked() to invoke
  onUidRulesChanged() when the Battery Saver status changed.
- Fixed updateRuleForRestrictBackgroundLocked() to invoke
  onUidRulesChanged() when an app whitelisted for Data Saver is brought
  back to the foreground.
- Added a new API (onRestrictPowerChanged() and getRestrictPower())
  to notify external services about Battery Saver mode changes.
- Fixed CS logic to properly handle the Battery Saver changes.

Externally to this change, the CTS tests were also improved to verify
the apps get the proper connection state; they can be verified running:

cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests \
    -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

BUG: 28521946

Change-Id: I8eaccd39968eb4b8c6b34f462fbc541e5daf55f1
2016-05-06 14:53:50 -07:00
Kevin Hufnagle
3344ed8620 docs: Restored references to "Know Your User" resource cards.
Bug: 28597771
Change-Id: Ic0c2a14369d623d2570c082486e3e38f6cbffb8e
2016-05-06 14:48:23 -07:00
Christopher Tate
110e2e8768 Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev
am: 0588954071

* commit '058895407140de0e513b82150c3acb6131e971a2':
  Move the 'pretend idle jobs can run now' broadcast into AMS

Change-Id: Ia97d382761fc8b9f2c11729cd027a2d8c6c9379b
2016-05-06 21:42:47 +00:00
TreeHugger Robot
de66540fd3 Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev 2016-05-06 21:41:41 +00:00
Chris Tate
0588954071 Merge "Move the 'pretend idle jobs can run now' broadcast into AMS" into nyc-dev 2016-05-06 21:34:52 +00:00
Sid Soundararajan
559233a068 Merge "Reset Cards as they come into view" into nyc-dev
am: 4fd98d1f09

* commit '4fd98d1f0996783ae5d9520315c02983c68c41f9':
  Reset Cards as they come into view

Change-Id: Ib659edbd4c5d7875fb1210cae895ea94c842ee63
2016-05-06 21:28:45 +00:00
Sid Soundararajan
4fd98d1f09 Merge "Reset Cards as they come into view" into nyc-dev 2016-05-06 21:16:56 +00:00
Pavlin Radoslavov
08f11bd631 Merge "Fix divergent equals and hashCode behavior" into nyc-dev
am: 2ff5780d90

* commit '2ff5780d903bb052fd9349b742d4d754f049202c':
  Fix divergent equals and hashCode behavior

Change-Id: I16809877a43fa3b3c70273de2a84a90e493d9caf
2016-05-06 21:08:14 +00:00
Winson
297785515b Fix exception when docking task.
am: 27c28f8da2

* commit '27c28f8da2925fd6fdaa91603c1740447b8fc195':
  Fix exception when docking task.

Change-Id: Iec927a1b079a7d6935b8430dca70eec760a84739
2016-05-06 21:08:12 +00:00
Winson
2a09199d82 Merge "Disabling movement of entire affiliated task set." into nyc-dev
am: 7e2d589ce0

* commit '7e2d589ce053ded6d07cc3f93297d6c32128dd3d':
  Disabling movement of entire affiliated task set.

Change-Id: Ia307ac34662cf0092f3ba00e20451b312d0cd7a8
2016-05-06 20:58:39 +00:00
TreeHugger Robot
2ff5780d90 Merge "Fix divergent equals and hashCode behavior" into nyc-dev 2016-05-06 20:54:18 +00:00
Winson
27c28f8da2 Fix exception when docking task.
- If a task fails to dock, animate the stack back to original state so 
  that the layout is not stuck in a "docked" state.

Bug: 28577229
Change-Id: If927b898a48cd5949764cb3b0c0798d22efd850a
2016-05-06 20:51:55 +00:00
Winson Chung
7e2d589ce0 Merge "Disabling movement of entire affiliated task set." into nyc-dev 2016-05-06 20:50:13 +00:00
Andrii Kulian
f9949d55c3 Fix onStop not called when activity is under translucent
Activity was not stopped when device went to sleep if it was covered by
another translucent activity. The issue appeared after ag/864253 which
disabled stopping for visible activities.

Bug: 28191555
Change-Id: I39f0c5579ee3e5a16db888c72ace5dc43aa307bd
2016-05-06 13:18:29 -07:00
Kevin Hufnagle
2c993cbbfa docs: Removed "Launcher Shortcuts" section.
The API for this feature is not yet ready.

Bug: 28636369
Change-Id: Iacf8f0d3a754e1440704bfb4490cd91dcbbf07c0
2016-05-06 13:13:15 -07:00
Keisuke Kuroyanagi
fa442e59cb Merge "Fix: Cannot control ime_switcher and menu after resetting." into nyc-dev
am: a423e2535b

* commit 'a423e2535b2d79849465db1a24aefa6779cc695b':
  Fix: Cannot control ime_switcher and menu after resetting.

Change-Id: I5d50dd2cb84687540a556922ad4000815c8e3073
2016-05-06 20:05:34 +00:00
Alan Viverette
a24c9b4791 Always mutate child when added to drawable container
Bug: 28456908
Change-Id: I3e7bea85e056882a331aecf7e225134161e685e6
2016-05-06 16:01:56 -04:00
Keisuke Kuroyanagi
a423e2535b Merge "Fix: Cannot control ime_switcher and menu after resetting." into nyc-dev 2016-05-06 19:52:48 +00:00
Pavlin Radoslavov
2f463d4c8b Fix divergent equals and hashCode behavior
Calling Objects.hash with a byte[] will call the identity hashCode on
the byte[] and this doesn't agree with the use of Objects.deepEquals
in equals.
Bug caught by error prone.

Also, replaced usage of Objects.deepEquals(mServiceDataUuid, ...) with
Objects.equals(mServiceDataUuid, ...), because mServiceDataUuid
is an Object of type ParcelUuid.

Bug: 28585195
Change-Id: Id92734874339985fedafe1a28286a6a4dcd88d3b
2016-05-06 12:45:43 -07:00
Ben Lin
ae00a14ae3 Removed duplicate call to Metric log, and using private logging method.
Bug: 28554140
Change-Id: I071c50ef5b51de65e71b85453cf83acae5ad6af7
2016-05-06 12:32:15 -07:00
Alan Viverette
32f7dab282 Cancel animation and jump to current state if not animating picker
Bug: 28629631
Change-Id: I0e1b3c2f2c774e027f2df8c9ab75c7a89bd2ddb7
2016-05-06 15:31:23 -04:00
Steve McKay
99544dd0f4 Don't persist selection after restore.
Bug: 28469988
Change-Id: I1fec774d8ebdec13b33262d7fe8e17fccd84b657
2016-05-06 12:27:49 -07:00
Sid Soundararajan
061f81e7b0 Reset Cards as they come into view
This will ensure that they are in the correct configuration. Needed since
recycler view will be re-using views.

BUG:28632740
Change-Id: Icdaa48696e198cfeb8c37718fec05f7f9b195842
2016-05-06 11:55:25 -07:00
Winson
6976f7bae9 Disabling movement of entire affiliated task set.
- This CL removes the dependency on the last-active-time of the task
  record, since that is dependent on the current system time (which can
  be changed by the user).  Instead of working around the previous
  behavior in ActivityManager which moves all affiliated tasks to the
  top when one task is launched, we change the behavior in the AM
  directly, and prevent re-sorting the list of recent tasks improperly
  (aside from the stable sort which puts the freeform tasks first).

Bug: 27398177

Change-Id: I9fa9b3497d08082fe00aa724538255de87e746d6
2016-05-06 18:53:05 +00:00
Jason Monk
4987524b27 QQS: Fix ripple clipping
Change-Id: Ib29265ca582e8563277466edefb32b0a5c852b2f
Fixes: 28175282
2016-05-06 14:44:25 -04:00
Jason Monk
d1590dca9c Merge "QS Header: remove collapsed alarm ripple" into nyc-dev
am: 5df0ee53ac

* commit '5df0ee53acc90e174f59be6c3c0fe52fd778a66e':
  QS Header: remove collapsed alarm ripple

Change-Id: Ic26aef478324ff0a579b73ba901ed8798d814f7d
2016-05-06 18:42:09 +00:00
Wale Ogunwale
3b030934f3 Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev
am: 5d6a218d9e

* commit '5d6a218d9e0d21367f6365d4de51532ca7e14dc9':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: Ia5f98128501fcf648da94d6393f799d83ca89656
2016-05-06 18:42:07 +00:00
Jason Monk
5df0ee53ac Merge "QS Header: remove collapsed alarm ripple" into nyc-dev 2016-05-06 18:36:00 +00:00
TreeHugger Robot
5d6a218d9e Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev 2016-05-06 18:30:23 +00:00
Phil Weaver
8f6e8c43cb Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev
am: b42afe9be0

* commit 'b42afe9be02b23c50c0479e93df2a853be7c369a':
  Make AccessibilityService#disableSelf atomic.

Change-Id: I90fc019bb38c2b8c5b71357bce60c8df298bddcc
2016-05-06 18:26:21 +00:00
Christopher Tate
27d92e4e39 Move the 'pretend idle jobs can run now' broadcast into AMS
It's a protected broadcast, so sending it directly from 'am' is
no longer an option.  This is needed for CTS as well as being
generally useful during app development.

Bug 28406044

Change-Id: I101915a8c6f19454330a8db2079a75023c112582
2016-05-06 11:25:11 -07:00
Chris Thornton
6e3449b33f Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev
am: 0f6a7abb83

* commit '0f6a7abb83687e8f800e7754cf585edca725d83e':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: Ieeb8c8eeac89a68ffcbcaf31b7f6d2b8c60dea7d
2016-05-06 18:10:28 +00:00
Paul Crowley
17e5dce511 Two phases to set the password for disk encryption
In one phase, we make the new password work, and in the second we make
it the only one which works ("fixation"). This means that we can set
the password in Gatekeeper between these two phases, and a crash
doesn't break things. Unlocking a user automatically fixates the
presented credential.

Bug: 28154455
Change-Id: I18812f9ce753486ce4e33b4fe2cca392b006b39c
2016-05-06 11:10:23 -07:00
Phil Weaver
b42afe9be0 Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev 2016-05-06 18:08:29 +00:00
Chris Thornton
0f6a7abb83 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev 2016-05-06 18:04:20 +00:00
Felipe Leme
46c4fc357c Refactored NetworkPolicyManagerService mUidRules.
NetworkPolicyManagerService (NMPS) keeps an internal list of uid
rules (mUidRules) for network restrictions, and when these rules
changes it needs to notify external listeners (such as
ConnectivityService / CS).

Prior to Android N, both Data Saver mode (the feature previously known
as "Restrict Baground Data") and Battery Save mode used the same set of
firewall rules to implement their restrictions: when Battery Saver mode
NPMS would mark all networks as metered and set the proper firewall
rules externally.

Recently, these 2 modes were split in 2 distinct firewall rules and
NMPS.updateRuleForRestrictBackgroundLocked() was changed to update
the mUidRules logic based on the Data Saver firewall (since the Battery
Saver firewall changes are handled externally, on
updateRuleForRestrictPowerLocked()). As such, CS was not notified when
the power-related changes were made, which would cause apps to get a
state of CONNECTED / CONNECTED when querying its active connection.

This change refactores the mUidRules to use bitmasks, in preparation for
another change that will fix the issue.

It also fixes a minor bug that was preventing removed packages to be
removed from the whitelist.

BUG: 28521946
Change-Id: I9f0e1509a6192cad403f740c1cd76a6b7dab7d26
2016-05-06 17:58:40 +00:00