Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,009 Commits 3 Branches 0 Tags
5466d7548e32afecfda10aaeee05b89cdc3950e2
Commit Graph

53964 Commits

Author SHA1 Message Date
Alan Viverette
5466d7548e am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit '4c06870db615acbf50008e0bc964e15a1c36aa22':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 20:26:33 +00:00
Alan Viverette
7fedf5d469 am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit '1c8107dd89c8424c8fad9e341dc43be04e1a62ae':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 20:26:28 +00:00
Jeff Sharkey
ca84303927 am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit '439e2db3f38f0d304757651b2d9291ba1c93f2d2':
  Always return content Uri for downloads.
 2015-07-29 20:26:21 +00:00
Raph Levien
c248a6cf34 am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit 'd9074d1eec5be644168dc17133f5bd753fedb614':
  Release text when finishing StaticLayout.Builder
 2015-07-29 20:11:20 +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
f6c2d8a9bf am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev 
* commit '6da43a835c0667e7f539ef47870d83f9bc516ef9':
  Remove dependencies on the package installer's package name
 2015-07-29 18:39:12 +00:00
Sailesh Nepal
2084291d18 am 33763760: am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev 
* commit '337637607df93491276a1285f57dd41afd219682':
  Default permissions for sim call manager
 2015-07-29 18:18:09 +00: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
Dianne Hackborn
cb98228dac am deb28b77: am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'deb28b770a0b11604fc20c71044a9c2d9718fe06':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 17:42:46 +00:00
Nicolas Prévot
95c26295c2 am 2b0cd2c7: am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev 
* commit '2b0cd2c7a19bbffce7b7f7e313c3dd5195c036ff':
  Send a public broadcast when the device owner is set.
 2015-07-29 17:42:41 +00:00
Sailesh Nepal
6b96de8dae Merge "Default permissions for sim call manager" into mnc-dev 2015-07-29 17:39:37 +00:00
Chris Wren
baafac4a97 am ce10d7a5: am 1bd310e1: Merge "import more metrics enums" into mnc-dev 
* commit 'ce10d7a5d88995d7839fbc3b994436e284534201':
  import more metrics enums
 2015-07-29 17:30:52 +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
Paul Jensen
8c83be093d am bf10991d: resolved conflicts for merge of 30813942 to mnc-dr-dev 
* commit 'bf10991d76ce6674726a668939be300cae150130':
  Disable WiFi autojoin when user decides via "Stay connected?" dialog
 2015-07-29 16:13:05 +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
170235a368 am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit 'acfaa947f45ce1ea8140c2dc52d5f750dbc0a94d':
  Give secondary users read-only physical cards.
 2015-07-29 02:01:13 +00: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
Dianne Hackborn
05e4e78d24 am 1b391d64: am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 
* commit '1b391d6499c161ded570ef45ad3083458529723d':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
 2015-07-29 01:26:55 +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
Adam Lesinski
858e4a6f89 am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit '9aae8d9c1b2219f9d98ac07b1fe04ef62c4cacb9':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 01:02:09 +00: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
fed9b2817f am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit '353fe1c665e0065d4c8eecdf41c22f1a1a607f2c':
  Animation for touch, wake and unlock
 2015-07-28 23:43:46 +00: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