197706 Commits

Author SHA1 Message Date
Svetoslav Ganov
a7a65ee4c5 Merge "Allow non system to set perm policy flags - needed by the installer" into mnc-dev 2015-07-29 17:38:29 +00:00
Svetoslav Ganov
120a86ac6f Merge "Do not reset runtime permissions on upgrade" into mnc-dev 2015-07-29 17:37:50 +00:00
Dianne Hackborn
eda1cc50ce Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 2015-07-29 17:05:58 +00:00
Nicolas Prévot
64ac302f0c Merge "Send a public broadcast when the device owner is set." into mnc-dev 2015-07-29 16:59:46 +00:00
Svet Ganov
525bc7a5a6 Allow non system to set perm policy flags - needed by the installer
My previous change overtightened which permission flags can be changed
by a non-system caller. This took away the capability of the package
installer to set policy flags which it needs to implement the auto
grant/deny behavior.

bug:22776149

Change-Id: Ic2a82bedc413fc91360c3bcec355fac456f0fccf
2015-07-29 09:09:26 -07:00
Svet Ganov
f480f2899c Do not reset runtime permissions on upgrade
bug:22772831

Change-Id: Ic7113f48bf4fe2fe2f50bf94c4b6dbb2130b6621
2015-07-29 08:40:18 -07:00
Chris Wren
1bd310e18c Merge "import more metrics enums" into mnc-dev 2015-07-29 14:57:15 +00:00
Paul Jensen
308139425e Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev 2015-07-29 13:52:02 +00:00
Narayan Kamath
7157c2ca81 Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev 2015-07-29 09:41:22 +00:00
Narayan Kamath
8d1e344f40 Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637.

Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
2015-07-29 09:35:46 +00:00
Martijn Coenen
50184147fc Merge "Resource for setting default NFC payment component." into mnc-dev 2015-07-29 07:54:29 +00:00
Shawn Willden
a7b4d6dc10 Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev 2015-07-29 03:58:39 +00:00
Jeff Sharkey
b8040265dd Merge "Give secondary users read-only physical cards." into mnc-dev 2015-07-29 01:19:43 +00:00
Dianne Hackborn
86cbc2bf30 Work on issue #22765972: Binder transactions running out of address...
...space causing package manager to fail

Lower the maximum IPC size we use in various places, to keep it
under the threshold of becoming dangerous.  Now everything tries
to keep not much more than 64k.

Change-Id: I814013097966a7843179e5d581bfdb254c5ae318
2015-07-28 18:13:21 -07:00
Ronghua Wu
02022b70be Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 2015-07-29 00:53:12 +00:00
Dianne Hackborn
b310c89453 Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev 2015-07-29 00:47:33 +00:00
Dianne Hackborn
5b009d523c Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev 2015-07-29 00:46:20 +00:00
Dianne Hackborn
b492ced89e Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 2015-07-29 00:45:18 +00:00
Dianne Hackborn
b795d7c4a3 Fix issue #22802691: APR: NPE in ActivityRecord
Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da
2015-07-28 17:40:06 -07:00
Adam Lesinski
c96e6f1993 Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 2015-07-29 00:34:38 +00:00
Jason Monk
fbcbad138d Merge "Add sizes to SysUI tests" into mnc-dev 2015-07-29 00:31:16 +00:00
Dianne Hackborn
9dc6c61a80 Fix issue #22802782: APR: NPE in package manager with bad intent data
If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.

Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
2015-07-28 17:30:59 -07:00
Dianne Hackborn
a73b68fb85 Fix issue #22802617: APR: spurious wtf when restarting a persistent process
Just don't do a wtf here, it isn't really wrong (though it isn't really
right, but at this point in a release it is right enough!).

Change-Id: Ic38a2e27556224cf8868f1fa18b4810929d67fcc
2015-07-28 17:22:46 -07:00
Aravind Akella
15938235d2 Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev 2015-07-29 00:21:18 +00:00
Adam Lesinski
c691d3ccf4 BatteryStats: Use proper power calculator when energy data is received
We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.

We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.

Bug:22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
2015-07-28 17:11:29 -07:00
Jorim Jaggi
0d210f6395 Animation for touch, wake and unlock
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
  First, start with a black scrim on top of everything, and then fade
  it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
  in the same manner as the scrim.

Bug: 22571198
Bug: 21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
2015-07-28 23:02:54 +00:00
Chris Tate
751a96a040 Merge "Don't redundantly call transport.finishRestore()" into mnc-dev 2015-07-28 22:56:41 +00:00
Zach Johnson
5faa033615 Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 2015-07-28 22:36:30 +00:00
Todd Kennedy
f2c616ed02 Merge "Partially revert package freezing" into mnc-dev 2015-07-28 22:15:43 +00:00
Ronghua Wu
4ef977c08f media: fix estimateFrameRatesFor to use correct ratio
Bug: 22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
2015-07-28 15:08:08 -07:00
Jeff Sharkey
4634987668 Give secondary users read-only physical cards.
Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.

More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.

This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users.  Other users remain able to read content elsewhere
on the card.

Bug: 22787184
Change-Id: Ied8c98995fec1b7b50ff7d930550feabb4398582
2015-07-28 14:42:34 -07:00
Christopher Tate
6ab2fb61f0 Don't redundantly call transport.finishRestore()
The RestoreSession is no longer responsible for calling finishRestore();
that happens as part of tidying up after running the restore itself,
even in failure cases.

Bug 22640096

Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522
2015-07-28 14:04:04 -07:00
Todd Kennedy
6b0c8315e4 Partially revert package freezing
On the Nexus Player, upgrading the launcher would cause multiple, simultaneous
processes to be running. In order to prevent this regression, revert the portion
of ag/682591 dealing with package upgrades.

Bug: 21123444
Change-Id: I7a4cf98c7e28fc9893b1c0358d3a98702d94c039
2015-07-28 13:52:49 -07:00
Nicolas Prevot
0079900883 Send a public broadcast when the device owner is set.
Make it a protected broadcast.

BUG: 22623518
Change-Id: Ia36e8f0b80a6301d7d8e0461476842c78762b5e8
2015-07-28 21:11:27 +01:00
Tyler Gunn
bdbec480e8 Merge "Add "Call subject" capability to phone accounts." into mnc-dev 2015-07-28 20:07:40 +00:00
Dianne Hackborn
3551a59b27 Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 2015-07-28 19:52:53 +00:00
Dianne Hackborn
57dd737443 Work on issue #21516866: Implement voice interaction in ResolverActivity
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.

This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.

Also added some debug help, having activity print the state of the
voice interactor.

Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
2015-07-28 12:52:11 -07:00
Jorim Jaggi
850dd6907f Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev 2015-07-28 19:49:44 +00:00
Robert Greenwalt
b3c93c5f42 Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 2015-07-28 19:39:48 +00:00
Alex Klyubin
e4928a2912 Keymaster digest/padding NONE no longer means ANY.
This adjusts the public API documentation to no longer say that
digest/padding NONE means any digest/padding. This also changes the
implementation of legacy key generation and import to explicitly
list which digests/paddings the generated/imported key is authorized
for. Previously, such keys were simply authorized for digest NONE and
padding NONE.

Bug: 22556114
Change-Id: Id02d9450a07de16ccb795b76b6de0006dd49dcca
2015-07-28 13:00:56 -06:00
Robert Greenwalt
a36c074052 Un-remove legacy ConnectivityManager API.
These were @removed too soon.  We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.

bug:22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
2015-07-28 11:41:31 -07:00
Jason Monk
3506621975 Merge "Fix network name not showing in QS sometimes" into mnc-dev 2015-07-28 18:05:49 +00:00
Chris Wren
de061b8175 import more metrics enums
sysui tuners
  inactive apps

Bug: 21114836
Change-Id: I43c4b97c6998374b39d7346bae1e1eca3d761543
2015-07-28 16:55:19 +00:00
Jason Monk
e427cb8076 Add sizes to SysUI tests
Change-Id: I27e4a60e2658d3a5db32cdeb73bd0a031865ce86
2015-07-28 10:06:01 -04:00
Adam Lesinski
602611375b Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev 2015-07-28 01:06:14 +00:00
Lorenzo Colitti
e288b3af14 Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* changes:
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:03:44 +00:00
Jorim Jaggi
1dfa7c6c79 Don't use screenshot if structure is disabled (1/2)
Bug: 22674955
Change-Id: I694bb8dbb578da9d729414c7f2947ba4c15651e3
2015-07-27 17:49:00 -07:00
Jorim Jaggi
965bab2bae Merge "Allow assist gesture when notification shade is expanded" into mnc-dev 2015-07-28 00:36:14 +00:00
Adam Lesinski
4c9ace51db BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
In practice I've seen the reported time spent in all WiFi energy states ~20 milliseconds larger
than the time between samples, which seems reasonable.

This will reduce false positives in APR.

Bug:22774068
Change-Id: Ibf33c9826586c8a1b70449b9a609cb51bdfc08b8
2015-07-27 17:19:23 -07:00
Mady Mellor
beb6e66817 Merge "Allow text selection handles to scroll horizontally" into mnc-dev 2015-07-28 00:16:49 +00:00