Commit Graph

53805 Commits

Author SHA1 Message Date
Adrian Roos
8e9b33f8fd am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev
* commit '726d47b7716807f740ceea6ea71c46b20ecb8ba7':
  Fix and deprecate lock pattern related settings
2015-07-29 20:58:32 +00:00
Adrian Roos
726d47b771 Merge "Fix and deprecate lock pattern related settings" into mnc-dev 2015-07-29 20:39:27 +00:00
Alan Viverette
4c06870db6 am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
* commit '47a74e7e2b45d9ec462f47f6741c381c478b4156':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
2015-07-29 20:10:21 +00:00
Alan Viverette
1c8107dd89 am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
* commit '5c380efa2c0bf3617aedbb9270fa02cce59c7935':
  Always distribute excess space in LinearLayout measurement
2015-07-29 20:10:16 +00:00
Jeff Sharkey
439e2db3f3 am b86048da: Merge "Always return content Uri for downloads." into mnc-dev
* commit 'b86048dab3df3e4a8f05de170b38c189243de898':
  Always return content Uri for downloads.
2015-07-29 20:10:09 +00:00
Alan Viverette
47a74e7e2b Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 2015-07-29 20:02:41 +00:00
Alan Viverette
5c380efa2c Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 2015-07-29 20:01:52 +00:00
Jeff Sharkey
b86048dab3 Merge "Always return content Uri for downloads." into mnc-dev 2015-07-29 19:59:36 +00:00
Raph Levien
d9074d1eec am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev
* commit 'c3cc344d12ff4a952af8842fab71ef2f6df5e340':
  Release text when finishing StaticLayout.Builder
2015-07-29 19:58:30 +00:00
Alan Viverette
7a40d21d89 Ensure maxHeight is at least 0 during measureChildHorizontal()
Bug: 22613599
Change-Id: I11f70ed1f7221874bef0f00f006e0ae294c4bdfa
2015-07-29 15:55:20 -04:00
Alan Viverette
4fabc02158 Always distribute excess space in LinearLayout measurement
Previously, excess space was added to existing measured dimensions.
This consistently resulted in incorrect allocation of excess space,
since the delta already included the height of any measured children
rather than just the excess space itself.

This CL ensures that excess space is always distributed according to the
layout weights.

Bug: 22810327
Change-Id: I482a553c469169769cc40ab3d88b4a44023f3eb5
2015-07-29 15:53:53 -04:00
Raph Levien
c3cc344d12 Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 2015-07-29 19:44:21 +00:00
Raph Levien
22ba7869f6 Release text when finishing StaticLayout.Builder
DynamicLayout reuses a StaticLayout.Builder object to avoid having to
allocate. There is a "finish" method that releases any expensive
internal state of the builder object, but it didn't release a
reference to the text object (which in turn may contain references to
lots of other things, especially if it's a Spannable).

This patch releases the text, as well as a few other arrays, at time
of finish.

Bug: 22822416
Change-Id: Icc8b6cd41a9a2d11689df7bd1b9f524c6524f706
2015-07-29 12:34:13 -07:00
Svetoslav Ganov
6da43a835c am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev
* commit '9352af2a9ef95e3f577a04474625249d3da62a04':
  Remove dependencies on the package installer's package name
2015-07-29 18:17:56 +00:00
Sailesh Nepal
337637607d am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev
* commit '6b96de8dae8be99f75c86c795672905e10fca153':
  Default permissions for sim call manager
2015-07-29 18:00:05 +00:00
Svetoslav Ganov
9352af2a9e Merge "Remove dependencies on the package installer's package name" into mnc-dev 2015-07-29 17:54:23 +00:00
Sailesh Nepal
6b96de8dae Merge "Default permissions for sim call manager" into mnc-dev 2015-07-29 17:39:37 +00:00
Dianne Hackborn
deb28b770a am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev
* commit 'eda1cc50cead674287616e6a852f8f281b70b9f5':
  Work on issue #22765972: Binder transactions running out of address...
2015-07-29 17:25:15 +00:00
Nicolas Prévot
2b0cd2c7a1 am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev
* commit '64ac302f0c10de0016689b234ba01c1c81da0061':
  Send a public broadcast when the device owner is set.
2015-07-29 17:25:10 +00:00
Jeff Sharkey
b11683ba62 Always return content Uri for downloads.
Now that we're relying more heavily on Uri permission grants between
apps, we should always return content:// Uris.

Bug: 22820206
Change-Id: Ie9603da09944dc594ea5dde2db04455f57d6f103
2015-07-29 10:22:30 -07: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
Chris Wren
ce10d7a5d8 am 1bd310e1: Merge "import more metrics enums" into mnc-dev
* commit '1bd310e18c50d4fd81207a3e2fe61cc694ee7607':
  import more metrics enums
2015-07-29 16:11:26 +00:00
Svet Ganov
f1b7f20bb8 Remove dependencies on the package installer's package name
bug:22700053

Change-Id: I8540eb8577fbec84e1a67e31e1c31ba654c828a4
2015-07-29 08:33:46 -07:00
Paul Jensen
bf10991d76 resolved conflicts for merge of 30813942 to mnc-dr-dev
Change-Id: I8b33797528f16596f0d350ad38458baa51fcacf6
2015-07-29 11:31:53 -04: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
Sailesh Nepal
cf85562bc9 Default permissions for sim call manager
This CL adds the following permissions by default to the
SIM call manager:
 - microphone
 - phone

BUG: 22790160
Change-Id: Icaf1db6c6943b3ddbd16a946a81d1bfb734d761f
2015-07-28 22:16:25 -07:00
Jeff Sharkey
acfaa947f4 am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit 'b8040265dd0d5a2a96e0850623647dad2f528db1':
  Give secondary users read-only physical cards.
2015-07-29 01:34:42 +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
Dianne Hackborn
1b391d6499 am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev
* commit 'b492ced89eaf38b2b9962dbfae2435dd242abf19':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
2015-07-29 01:00:37 +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
Adam Lesinski
9aae8d9c1b am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit 'c96e6f19937ac36c8147a52863a43b35895aeb0b':
  BatteryStats: Use proper power calculator when energy data is received
2015-07-29 00:41:03 +00: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
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
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
353fe1c665 am 0d210f63: Animation for touch, wake and unlock
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock
2015-07-28 23:19:39 +00: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
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
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
Dianne Hackborn
108f5493ed am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '3551a59b277fd4dc924f48116c153a50fb0913eb':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
2015-07-28 19:57:40 +00:00
Robert Greenwalt
d6162cf244 am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev
* commit 'b3c93c5f4256a1da1a8020abe5812a841b67667a':
  Un-remove legacy ConnectivityManager API.
2015-07-28 19:57:31 +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
Robert Greenwalt
b3c93c5f42 Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 2015-07-28 19:39:48 +00: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
Chris Wren
de061b8175 import more metrics enums
sysui tuners
  inactive apps

Bug: 21114836
Change-Id: I43c4b97c6998374b39d7346bae1e1eca3d761543
2015-07-28 16:55:19 +00:00
Adrian Roos
7811d9f509 Fix and deprecate lock pattern related settings
Bug: 22557690
Change-Id: Ib4b3ef7cebe815ba9d9d2284f945a9ec746b216c
2015-07-27 19:59:27 -07:00
Lorenzo Colitti
62ca62b32a am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit 'e288b3af14421731d8f477b97e8d77588f20498b':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
2015-07-28 01:20:16 +00:00