Commit Graph

64549 Commits

Author SHA1 Message Date
Amith Yamasani
0ce0116338 Merge "Fix multi-window assiststructure trashing" into nyc-dev
am: a66d395490

* commit 'a66d395490fc0797fb7b24ad8148c510a6e2cff3':
  Fix multi-window assiststructure trashing

Change-Id: I8bf4366b8e5bf7b0c37a9f81e2d0303b8dfdd22d
2016-05-10 22:32:53 +00:00
Amith Yamasani
a66d395490 Merge "Fix multi-window assiststructure trashing" into nyc-dev 2016-05-10 22:29:20 +00:00
Adam Powell
d8cc73d92b Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev
am: 56e2aeba8f

* commit '56e2aeba8fb40190dbe1303ae1d299e77e764b44':
  Move Activity multi-window event logic out of the public methods

Change-Id: I74706461487dde9e4f3ff3ff62be4e5778190c52
2016-05-10 21:37:05 +00:00
Chong Zhang
7722999ebd Disable keep_screen_on traces
am: 44aabe4b72

* commit '44aabe4b7240a9a03678b4a66bdd5f46a9dfb29a':
  Disable keep_screen_on traces

Change-Id: Icc19da42ecec4231fe323b3bb9d728ef02812918
2016-05-10 21:37:02 +00:00
Winson
4f4152a9e2 Merge "Reducing the number of recent tasks we keep." into nyc-dev
am: 9e935820b5

* commit '9e935820b5d0134d71fc5ae51001b276ab603c51':
  Reducing the number of recent tasks we keep.

Change-Id: If44266c1872505f90cb8ae60c6a8fbdbca495d6e
2016-05-10 21:36:58 +00:00
Adam Powell
56e2aeba8f Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev 2016-05-10 21:34:29 +00:00
Chong Zhang
44aabe4b72 Disable keep_screen_on traces
bug: 28692100
bug: 27522448

Change-Id: Ic077e8985f1f21bc111287813fb2992ed01df909
2016-05-10 21:34:01 +00:00
Winson Chung
9e935820b5 Merge "Reducing the number of recent tasks we keep." into nyc-dev 2016-05-10 21:33:33 +00:00
Keisuke Kuroyanagi
99ac8cb861 Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev
am: f2cbf95b6b

* commit 'f2cbf95b6b48d0c5dea14db4edbd255ff751beaa':
  Sum up character widths to get the last line width for ellipsis.

Change-Id: Iaa3cab4dfb904c0291e703eca9125aef0ef50f70
2016-05-10 21:25:17 +00:00
Keisuke Kuroyanagi
f2cbf95b6b Merge "Sum up character widths to get the last line width for ellipsis." into nyc-dev 2016-05-10 21:16:02 +00:00
Paul Crowley
05190e3bbf Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
am: f829c1463b

* commit 'f829c1463b4805545d15924ad6243b9405eb83d6':
  Revert "Two phases to set the password for disk encryption"

Change-Id: Ic57b08d344020d9705a4bc2208b4adabebbe9151
2016-05-10 21:13:55 +00:00
Paul Crowley
f829c1463b Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev 2016-05-10 21:07:59 +00:00
Antonio Cansado
7598ac2aa7 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev
am: dc5f558640

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I952e69e7cfbd8cebcbac7c3b19ede300e26777e8
2016-05-10 21:05:17 +00:00
Winson
7c40291b0a Reducing the number of recent tasks we keep.
- This should decrease the time it takes to fetch the recent task list,
  and also reduce the number of tasks we store on-disk.
- Since a user can still open a fair number of tasks within the 
  time-window, and this list includes tasks that are excluded from the 
  UI, we are just reducing it to about half for the time being.

Bug: 28318359
Change-Id: Ie21b3d3d09a567007015fbbecaf914123c71cc06
2016-05-10 21:01:33 +00:00
Paul Crowley
a1eb750e75 Revert "Two phases to set the password for disk encryption"
This reverts commit 17e5dce511.

Bug: 28694324
Change-Id: I6d89bc26cb429b195c9bcf640666c495617257b7
2016-05-10 20:36:56 +00:00
Phil Weaver
905c159749 Merge "Reduce cost of a11y services with magnification." into nyc-dev
am: cdaaaaad90

* commit 'cdaaaaad905396e4f0f2ebd9b37240095182d1d7':
  Reduce cost of a11y services with magnification.

Change-Id: Ib93769bbbce508d0eae77cd830d361e5e686de47
2016-05-10 20:25:31 +00:00
Antonio Cansado
6965c1869a Addressing API council comments on NetworkStatsManager.
Callbacks
 - DataUsageCallback renamed to UsageCallback
 - DataUsagePolicy removed; passing in params directly to register method
 - making it an abstract class
 - passing in (networkType, subscriberId) that reached its threshold
 - renaming onLimitReached to onThresholdReached to match existing naming
 - only monitor single network,subscriberId
 - no monitoring of specific uids; using device or user wide instead

Tags
 - only owner uid can read its tags
 - exposing only TAG_NONE to match service side

BUG: 27530098

Change-Id: I2b2664da71806868a1e937d2bf4d1f234637509b
2016-05-10 13:24:16 -07:00
Phil Weaver
cdaaaaad90 Merge "Reduce cost of a11y services with magnification." into nyc-dev 2016-05-10 20:18:12 +00:00
Andreas Gampe
ddaeb30d5b Merge "Frameworks/base: Shorten system property" into nyc-dev
am: a8f51e3e46

* commit 'a8f51e3e46c705b0477bf20a8e417ab57e09afee':
  Frameworks/base: Shorten system property

Change-Id: I9e90c9ed260cd74f1585d5851c65a6c78f245daf
2016-05-10 20:02:44 +00:00
Andreas Gampe
a8f51e3e46 Merge "Frameworks/base: Shorten system property" into nyc-dev 2016-05-10 19:55:43 +00:00
Andreas Gampe
eff0639345 Frameworks/base: Shorten system property
Otherwise it's too long.

Bug: 26877591
Change-Id: I741186a9fbea6ee50df6cef58d528ec58662c772
2016-05-10 12:52:53 -07:00
Dimitry Ivanov
22c0dcc253 Merge "Simplify permitted-path construction" into nyc-dev
am: 6e2b3d158a

* commit '6e2b3d158a333b8754854314af0fc865a1f8bc5e':
  Simplify permitted-path construction

Change-Id: Ib3c67e6fd52ea847a194dfd3737c9cf2c75e17b7
2016-05-10 19:25:33 +00:00
Keisuke Kuroyanagi
78f0d83550 Sum up character widths to get the last line width for ellipsis.
To properly apply ellipsis, we virtually concatenate the last line and
overflowed lines after line breaking for a paragraph.
Previously, width of the concatenated line was computed by summing up all
line's width.  However, the width is wrong when there are any trailing
white  spaces that can be normal white spaces by concatenating lines.
With this CL, we sum up widths of all characters in lines except the last
overflowed line.

Bug: 28599066
Change-Id: I41d828ee8eb8a702cd5096d626b307cbb3467047
2016-05-10 12:21:33 -07:00
Amith Yamasani
4f128e4d96 Fix multi-window assiststructure trashing
When multiple activities within the same process
try to handle requests for AssistStructure, the
singleton mLastAssistStructure tends to trash
the old structure when a second window's request
comes in.

This change passes in a sessionId so that the
cache is only cleared if the session id changes.

Bug: 28348867
Change-Id: I07efcd933db7e48aefd25a1c95493b71bbcffe4b
2016-05-10 12:17:51 -07:00
Dimitry Ivanov
eb96b00382 Simplify permitted-path construction
The white list of permitted directories is applied for every
classloader namespace by libnativeloader. LoadedApk no longer
needs to do that.

Add mDataDir to permitted paths in the case if for any reason
it is outside of the whitelisted dirs.

Bug: http://b/28639227
Change-Id: I5b61ac64e281ecee3e3e9b1fe56cf04dc6ee7b25
2016-05-10 10:51:40 -07:00
Andreas Gampe
2f67d686eb Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev
am: a2723ca88c

* commit 'a2723ca88c630f62ac413e562fe335b5fc623f1c':
  Frameworks/base: Make profile buffer adjustable

Change-Id: Ica4a50834a2b1da2644e85d28ee1e7196c3feb2b
2016-05-10 04:30:22 +00:00
Andreas Gampe
a2723ca88c Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev 2016-05-10 04:15:13 +00:00
Andreas Gampe
0f03a01ca3 Frameworks/base: Make profile buffer adjustable
Add a debug system property to change the profile buffer size.

Bug: 26877591
Change-Id: Idd13f2bc6563fd88daadd1d6679f3243dab1a0ef
2016-05-09 21:05:12 -07:00
Phil Weaver
2fbdd48682 Reduce cost of a11y services with magnification.
Services that declare that they can control magnification,
but never actually make a change or register a listener
waste cycles as we compute magnification data they never use.

Avoid registering for magnification callbacks unless magnification
gestures are enabled, a service is listening for magnification
changes, or a service has changed magnification.

Bug: 28425922
Change-Id: I114a833669bd53b2cd757c94ea52b65a2f838a08
2016-05-09 16:21:29 -07:00
Adam Powell
858cf036a3 Move Activity multi-window event logic out of the public methods
Move the logic for dispatching multi-window mode change events to
fragments and the activity window out of the public API onFoo methods
meant to be overridden by apps. This prevents problems if an extending
class forgets to call super.onFoo in these methods and removes the
need for doing so.

Bug 28667205

Change-Id: Ibf4c543e22b95753e1e4812bbd3e81f7648de54d
2016-05-09 15:45:37 -07:00
Joe Onorato
bdff78d9ea Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev
am: 3b25fd081d

* commit '3b25fd081d6af21b16ab4b96ead70766b3d78d06':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: Iec6ad93e7445df5d642aba24867c264c435c53ba
2016-05-09 22:17:10 +00:00
TreeHugger Robot
3b25fd081d Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev 2016-05-09 22:03:05 +00:00
Paul Crowley
d365ddbd73 Merge "Two phases to set the password for disk encryption" into nyc-dev
am: 9aa6bb5a4a

* commit '9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4':
  Two phases to set the password for disk encryption

Change-Id: Ic8102ebd218f387236aa5ef013ccdf4bc8f58ce1
2016-05-09 21:50:20 +00:00
Paul Crowley
9aa6bb5a4a Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-09 21:35:34 +00:00
Joe Onorato
168638c594 Fix a couple bad links in the javadoc for android.os.health.
Bug: 28295754
Change-Id: I3b21e204bec626e4d1c6fb8f07580c2854e364eb
2016-05-09 13:32:32 -07:00
Joe Onorato
8b552ed03c Merge changes I04301fbd,If6577602 into nyc-dev
am: ac29617c6e

* commit 'ac29617c6e11085c9648d150a50c5daa15d65645':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: If9d0461325336f6c5cb6faca34bac17c8ef6a35e
2016-05-09 20:17:06 +00:00
TreeHugger Robot
ac29617c6e Merge changes I04301fbd,If6577602 into nyc-dev
* changes:
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
2016-05-09 20:05:13 +00:00
Joe Onorato
181cada18a Flesh out the docs for the android.os.health package.
Bug: 28295754
Change-Id: I04301fbdbfb0708172adb4fd4b4a3658d5ea14eb
2016-05-09 10:32:31 -07:00
Alan Viverette
3f9d17fbe1 Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev
am: d8c38b892b

* commit 'd8c38b892b86cc9cb94633b6f9d74126e2d53c60':
  Cancel animation and jump to current state if not animating picker

Change-Id: Icdc36f4f5133b16a1b15d7cf58d1e0ef21fe9b7e
2016-05-09 14:14:33 +00:00
Alan Viverette
d8c38b892b Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev 2016-05-09 14:06:29 +00:00
Felipe Leme
9a48ee1b3e 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: I0fd66b16c83680940f294ea8e117443ffd8a50cd
2016-05-06 23:38:59 +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
d0e3d18b7f Merge "Properly map runtime permissions to app ops" into nyc-dev
am: ba83e90e18

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

Change-Id: Ied52aa9c152429092f3c9f3e93b79b5e58c27cac
2016-05-06 23:17:53 +00:00
Svetoslav Ganov
ba83e90e18 Merge "Properly map runtime permissions to app ops" into nyc-dev 2016-05-06 23:08:31 +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
Felipe Leme
443c032e52 Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev
am: de66540fd3

* commit 'de66540fd3f73937c3cfbe1d50e575aa69acc474':
  Refactored NetworkPolicyManagerService mUidRules.

Change-Id: I25d2520eafcf8c45b80b94908a3b5bfa04315f76
2016-05-06 21:53:39 +00:00
Christopher Tate
2591ee2b0b 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: Id8bd50f0a5f6d46cf60dea690803081515cb21c3
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
Pavlin Radoslavov
3600d1f06f Merge "Fix divergent equals and hashCode behavior" into nyc-dev
am: 2ff5780d90

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

Change-Id: Iac35b033432a9441c3a72b8f7430f15238e1e8fb
2016-05-06 21:08:17 +00:00