OSDN Git Service
Billy Lau [Wed, 29 Jul 2015 22:46:20 +0000 (22:46 +0000)]
am
a6706627: Merge "Bug:
21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
* commit '
a6706627a9bf749cc591605272810e03983a9eea':
Bug:
21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
Ji Yang [Wed, 29 Jul 2015 22:46:16 +0000 (22:46 +0000)]
am
499f084d: Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev
* commit '
499f084d9e7bb3323ed447b16f548bad9b886aa7':
Add API to let carrier app send SMS without auto perisisting.
Billy Lau [Wed, 29 Jul 2015 22:42:27 +0000 (22:42 +0000)]
Merge "Bug:
21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev
Ji Yang [Wed, 29 Jul 2015 22:35:30 +0000 (22:35 +0000)]
Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev
Dan Sandler [Wed, 29 Jul 2015 22:32:15 +0000 (22:32 +0000)]
am
25ffc7ad: Accessibility: Read the time correctly in quick settings.
* commit '
25ffc7ad950d9b2857abe9cb66ed53aed7a18ecf':
Accessibility: Read the time correctly in quick settings.
Billy Lau [Fri, 17 Jul 2015 23:26:58 +0000 (00:26 +0100)]
Bug:
21589105 Rescope WRITE_SETTINGS permission (framework services perm check
changes)
AppOpsManager:
Changed the default operating mode for WRITE_SETTINGS to MODE_DEFAULT from
MODE_ALLOWED.
packages/SettingsProvider:
We no longer do static permission checks for WRITE_SETTINGS in early checks and
defer that to app op when MODE_DEFAULT is returned. For some operations,
checking against WRITE_SECURE_SETTINGS is sufficient.
ActivityManagerService & PowerManagerService:
Incorporated app op checks and handled the MODE_DEFAULT case.
provider/Settings:
Added helper function to do checks on whether app ops protected operations
can be performed by a caller. This includes checks for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW.
Also added a public API (with javadocs) for apps to query if they can modify
system settings.
Changed the javadocs description for ACTION_MANAGE_WRITE_SETTINGS and
ACTION_MANAGE_OVERLAY_PERMISSION.
Added public API (with javadocs) for apps to query whether they can draw overlays or not,
and also javadocs description on how to use that check.
Change-Id: I7b651fe8af836c2074defdbd6acfec3f32acdbe9
Dan Sandler [Thu, 11 Jun 2015 13:17:07 +0000 (09:17 -0400)]
Accessibility: Read the time correctly in quick settings.
The problem is that, for 12-hour locales, we cut the "a"
part of the time format out to show it in a separate
TextView so it can be animated independently of the actual
time. Unfortunately, while TTS is smart enough to pronounce
"1:15 AM" as /wʌn fɪftin eɪ ɛm/, "AM" on its own looks like
the English word "am" and is pronounced /æm/.
To fix this, a TextClock must be able to accept separate
formats for its content description than its presentation.
With this capability we can place the complete 12-hour time
format (including am/pm) in one of the views and suppress
the other one, so that the utterance creates an identical
experience to visual inspection: "1:15 AM" for all users.
Bug:
21718000
Change-Id: Ic9920d71ae4d4ad41ba86d7bd96f9a19b07e2108
Robert Greenwalt [Wed, 29 Jul 2015 22:08:15 +0000 (22:08 +0000)]
am
771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
* commit '
771d210ab2d0df9d6748eb56e3f7250377df1fc4':
Revert "DO NOT MERGE Enhance local log."
Svetoslav Ganov [Wed, 29 Jul 2015 22:08:11 +0000 (22:08 +0000)]
am
393c7fb2: Merge "Default grants: handle update system packages" into mnc-dev
* commit '
393c7fb2c67e7fc9dfab710a52313f9b55aaa57c':
Default grants: handle update system packages
Robert Greenwalt [Wed, 29 Jul 2015 22:00:40 +0000 (22:00 +0000)]
Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
Svetoslav Ganov [Wed, 29 Jul 2015 21:54:13 +0000 (21:54 +0000)]
Merge "Default grants: handle update system packages" into mnc-dev
Adrian Roos [Wed, 29 Jul 2015 21:37:08 +0000 (21:37 +0000)]
am
e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit '
e2cd84196e1266200f906b5d721640217fc2e6f9':
Fix pattern lock for accessibility
Adrian Roos [Wed, 29 Jul 2015 21:23:25 +0000 (21:23 +0000)]
Merge "Fix pattern lock for accessibility" into mnc-dev
Adrian Roos [Mon, 27 Jul 2015 20:49:53 +0000 (13:49 -0700)]
Fix pattern lock for accessibility
- remove the content description in Keyguard
- only show virtual views when pattern is in progress
- add a content description when the pattern is not in progress
Bug:
22646748
Change-Id: Id32a37c4c74c82b547cee8861b2856fa0a08c41c
Robert Greenwalt [Wed, 29 Jul 2015 19:12:01 +0000 (19:12 +0000)]
Revert "DO NOT MERGE Enhance local log."
This reverts commit
dd6f8441292d30cc51c1e32bb27fab8dfb791f90.
bug:
22632129
Change-Id: Ibd4b9c35b66cb7d877085bc010fde45a682ba34f
Svetoslav [Wed, 29 Jul 2015 21:00:18 +0000 (14:00 -0700)]
Default grants: handle update system packages
If there is an app on the system image that gets default
grants but it is updated with a version that does not use
all permissions the version on the system image does, we
would wrongly try to grant a permission to the updated app
that it does not request and crash as a result. Now we
default grant permission that are requested by the system
version of the app regardless if it is updated but only if
the system app is not updated or the update also uses these
permissions.
bug:
22800767
Change-Id: Ic22b62ba4976367420a56bdadc8e3824b0b9104f
Alan Viverette [Wed, 29 Jul 2015 20:58:38 +0000 (20:58 +0000)]
am
93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev
* commit '
93184eef410da6bb958d22e1dc90f3fddabc9369':
DO NOT MERGE: Don't backup night mode setting
Adrian Roos [Wed, 29 Jul 2015 20:58:32 +0000 (20:58 +0000)]
am
726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev
* commit '
726d47b7716807f740ceea6ea71c46b20ecb8ba7':
Fix and deprecate lock pattern related settings
Alan Viverette [Wed, 29 Jul 2015 20:46:08 +0000 (20:46 +0000)]
Merge "DO NOT MERGE: Don't backup night mode setting" into mnc-dev
Adrian Roos [Wed, 29 Jul 2015 20:39:27 +0000 (20:39 +0000)]
Merge "Fix and deprecate lock pattern related settings" into mnc-dev
Ji Yang [Thu, 23 Jul 2015 17:16:07 +0000 (10:16 -0700)]
Add API to let carrier app send SMS without auto perisisting.
Bug:
22773702
Change-Id: I976a8268ce95fe9fc5bb046ce744a1cddefc8eeb
Alan Viverette [Wed, 29 Jul 2015 20:22:03 +0000 (16:22 -0400)]
DO NOT MERGE: Don't backup night mode setting
Bug:
22824325
Change-Id: I7a244f416e1aa258735eea09858e3c202e8c8945
Alan Viverette [Wed, 29 Jul 2015 20:10:21 +0000 (20:10 +0000)]
am
47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
* commit '
47a74e7e2b45d9ec462f47f6741c381c478b4156':
Ensure maxHeight is at least 0 during measureChildHorizontal()
Alan Viverette [Wed, 29 Jul 2015 20:10:16 +0000 (20:10 +0000)]
am
5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
* commit '
5c380efa2c0bf3617aedbb9270fa02cce59c7935':
Always distribute excess space in LinearLayout measurement
Jeff Sharkey [Wed, 29 Jul 2015 20:10:09 +0000 (20:10 +0000)]
am
b86048da: Merge "Always return content Uri for downloads." into mnc-dev
* commit '
b86048dab3df3e4a8f05de170b38c189243de898':
Always return content Uri for downloads.
Alan Viverette [Wed, 29 Jul 2015 20:02:41 +0000 (20:02 +0000)]
Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
Alan Viverette [Wed, 29 Jul 2015 20:01:52 +0000 (20:01 +0000)]
Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev
Jeff Sharkey [Wed, 29 Jul 2015 19:59:36 +0000 (19:59 +0000)]
Merge "Always return content Uri for downloads." into mnc-dev
Raph Levien [Wed, 29 Jul 2015 19:58:30 +0000 (19:58 +0000)]
am
c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev
* commit '
c3cc344d12ff4a952af8842fab71ef2f6df5e340':
Release text when finishing StaticLayout.Builder
Alan Viverette [Wed, 29 Jul 2015 19:55:20 +0000 (15:55 -0400)]
Ensure maxHeight is at least 0 during measureChildHorizontal()
Bug:
22613599
Change-Id: I11f70ed1f7221874bef0f00f006e0ae294c4bdfa
Alan Viverette [Wed, 29 Jul 2015 19:53:53 +0000 (15:53 -0400)]
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
Raph Levien [Wed, 29 Jul 2015 19:44:21 +0000 (19:44 +0000)]
Merge "Release text when finishing StaticLayout.Builder" into mnc-dev
Raph Levien [Wed, 29 Jul 2015 19:34:13 +0000 (12:34 -0700)]
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
Wale Ogunwale [Wed, 29 Jul 2015 19:23:48 +0000 (19:23 +0000)]
am
25782ef8: Merge "Added stack id to TaskRecord dump." into mnc-dev
* commit '
25782ef834514d6e24a0f8aaa463683d1a7f95f3':
Added stack id to TaskRecord dump.
Roshan Pius [Wed, 29 Jul 2015 19:14:40 +0000 (19:14 +0000)]
am
944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev
* commit '
944b63624b40c96f4a31af750e1678c0b9c88ad1':
Add a command to register SIM Phone account.
Wale Ogunwale [Wed, 29 Jul 2015 19:11:44 +0000 (19:11 +0000)]
Merge "Added stack id to TaskRecord dump." into mnc-dev
Roshan Pius [Wed, 29 Jul 2015 18:54:04 +0000 (18:54 +0000)]
Merge "Add a command to register SIM Phone account." into mnc-dev
Maurice Lam [Wed, 29 Jul 2015 18:43:02 +0000 (18:43 +0000)]
am
75d958c4: Merge "Disable launching assist during setup" into mnc-dev
* commit '
75d958c40e67c338d65df185ce1f09b164c58d49':
Disable launching assist during setup
Wale Ogunwale [Wed, 29 Jul 2015 18:38:01 +0000 (11:38 -0700)]
Added stack id to TaskRecord dump.
Bug:
22812470
Change-Id: Ic8f3550e61ad1cf175423abe900c5f60686338a2
Maurice Lam [Wed, 29 Jul 2015 18:25:16 +0000 (18:25 +0000)]
Merge "Disable launching assist during setup" into mnc-dev
Christine Hallstrom [Wed, 29 Jul 2015 18:18:26 +0000 (18:18 +0000)]
am
a42e6816: Merge "Change NTP polling interval from 10 days to 24 hours." into mnc-dev
* commit '
a42e6816512e637e5322be8c66d3cc5eff840647':
Change NTP polling interval from 10 days to 24 hours.
Geoff Mendal [Wed, 29 Jul 2015 18:18:22 +0000 (18:18 +0000)]
am
3986360a: (-s ours) Import translations. DO NOT MERGE
* commit '
3986360a752563e78b9d06f5a9ee7c4d61b979c8':
Import translations. DO NOT MERGE
Svetoslav Ganov [Wed, 29 Jul 2015 18:17:56 +0000 (18:17 +0000)]
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
Sailesh Nepal [Wed, 29 Jul 2015 18:00:05 +0000 (18:00 +0000)]
am
6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev
* commit '
6b96de8dae8be99f75c86c795672905e10fca153':
Default permissions for sim call manager
Svetoslav Ganov [Wed, 29 Jul 2015 18:00:01 +0000 (18:00 +0000)]
am
a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the installer" into mnc-dev
* commit '
a7a65ee4c5fb879fee258c63b92e49ab4571bbdb':
Allow non system to set perm policy flags - needed by the installer
Christine Hallstrom [Wed, 29 Jul 2015 17:59:23 +0000 (17:59 +0000)]
Merge "Change NTP polling interval from 10 days to 24 hours." into mnc-dev
Svetoslav Ganov [Wed, 29 Jul 2015 17:58:20 +0000 (17:58 +0000)]
am
120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-dev
* commit '
120a86ac6f4ac6d2dfdef01dd1fbefdcd1cc8735':
Do not reset runtime permissions on upgrade
Geoff Mendal [Wed, 29 Jul 2015 17:57:52 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic4e540e08175014515a7556425c751de60955005
Auto-generated-cl: translation import
Svetoslav Ganov [Wed, 29 Jul 2015 17:54:23 +0000 (17:54 +0000)]
Merge "Remove dependencies on the package installer's package name" into mnc-dev
Christine Hallstrom [Tue, 14 Jul 2015 21:01:51 +0000 (14:01 -0700)]
Change NTP polling interval from 10 days to 24 hours.
Bug:
22820525
Change-Id: Ifb5da0a19854d751d00889e4c9d075e909414d62
Sailesh Nepal [Wed, 29 Jul 2015 17:39:37 +0000 (17:39 +0000)]
Merge "Default permissions for sim call manager" into mnc-dev
Svetoslav Ganov [Wed, 29 Jul 2015 17:38:29 +0000 (17:38 +0000)]
Merge "Allow non system to set perm policy flags - needed by the installer" into mnc-dev
Svetoslav Ganov [Wed, 29 Jul 2015 17:37:50 +0000 (17:37 +0000)]
Merge "Do not reset runtime permissions on upgrade" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 17:25:15 +0000 (17:25 +0000)]
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...
Nicolas Prévot [Wed, 29 Jul 2015 17:25:10 +0000 (17:25 +0000)]
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.
Jeff Sharkey [Wed, 29 Jul 2015 17:15:34 +0000 (10:15 -0700)]
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
Dianne Hackborn [Wed, 29 Jul 2015 17:05:58 +0000 (17:05 +0000)]
Merge "Work on issue #
22765972: Binder transactions running out of address..." into mnc-dev
Nicolas Prévot [Wed, 29 Jul 2015 16:59:46 +0000 (16:59 +0000)]
Merge "Send a public broadcast when the device owner is set." into mnc-dev
Chris Wren [Wed, 29 Jul 2015 16:11:26 +0000 (16:11 +0000)]
am
1bd310e1: Merge "import more metrics enums" into mnc-dev
* commit '
1bd310e18c50d4fd81207a3e2fe61cc694ee7607':
import more metrics enums
Svet Ganov [Wed, 29 Jul 2015 16:09:12 +0000 (09:09 -0700)]
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
Geoff Mendal [Wed, 29 Jul 2015 15:55:17 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 29 Jul 2015 15:48:35 +0000 (10:48 -0500)]
Import translations. DO NOT MERGE
Change-Id: I19194b84982233195bf264468eb13341216adf93
Auto-generated-cl: translation import
Svet Ganov [Wed, 29 Jul 2015 15:39:41 +0000 (08:39 -0700)]
Do not reset runtime permissions on upgrade
bug:
22772831
Change-Id: Ic7113f48bf4fe2fe2f50bf94c4b6dbb2130b6621
Svet Ganov [Wed, 29 Jul 2015 15:33:42 +0000 (08:33 -0700)]
Remove dependencies on the package installer's package name
bug:
22700053
Change-Id: I8540eb8577fbec84e1a67e31e1c31ba654c828a4
Paul Jensen [Wed, 29 Jul 2015 15:31:53 +0000 (11:31 -0400)]
resolved conflicts for merge of
30813942 to mnc-dr-dev
Change-Id: I8b33797528f16596f0d350ad38458baa51fcacf6
Chris Wren [Wed, 29 Jul 2015 14:57:15 +0000 (14:57 +0000)]
Merge "import more metrics enums" into mnc-dev
Geoff Mendal [Wed, 29 Jul 2015 13:55:41 +0000 (13:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 29 Jul 2015 13:55:26 +0000 (13:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 29 Jul 2015 13:53:51 +0000 (13:53 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Paul Jensen [Wed, 29 Jul 2015 13:52:02 +0000 (13:52 +0000)]
Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev
Geoff Mendal [Wed, 29 Jul 2015 13:47:22 +0000 (06:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie86135b25283948fc05f3e0d412c43546e2a743b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Jul 2015 13:47:13 +0000 (06:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic25ca6f4c2731504667b39642343bff77f8ad7bf
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Jul 2015 13:44:19 +0000 (06:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b1557f5ff69d19dadcf7be20a4a34eb55740466
Auto-generated-cl: translation import
Geoff Mendal [Wed, 29 Jul 2015 13:43:43 +0000 (06:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief1b2813d780945621684d6d58403feac34fa498
Auto-generated-cl: translation import
Narayan Kamath [Wed, 29 Jul 2015 10:08:04 +0000 (10:08 +0000)]
am
7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev
* commit '
7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6':
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
Narayan Kamath [Wed, 29 Jul 2015 09:41:22 +0000 (09:41 +0000)]
Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev
Narayan Kamath [Wed, 29 Jul 2015 09:35:46 +0000 (09:35 +0000)]
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."
This reverts commit
5967ddbf05f146bdb6744207e3daed1aa76fc637.
Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
Martijn Coenen [Wed, 29 Jul 2015 08:10:18 +0000 (08:10 +0000)]
am
50184147: Merge "Resource for setting default NFC payment component." into mnc-dev
* commit '
50184147fc35d5d441ae24661531819cc6cc025f':
Resource for setting default NFC payment component.
Martijn Coenen [Wed, 29 Jul 2015 07:54:29 +0000 (07:54 +0000)]
Merge "Resource for setting default NFC payment component." into mnc-dev
Sailesh Nepal [Wed, 29 Jul 2015 02:22:14 +0000 (19:22 -0700)]
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
Shawn Willden [Wed, 29 Jul 2015 04:17:51 +0000 (04:17 +0000)]
am
a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev
* commit '
a7b4d6dc1017bcb2e6144fa5eb9d2ed07093ffa8':
Keymaster digest/padding NONE no longer means ANY.
Shawn Willden [Wed, 29 Jul 2015 03:58:39 +0000 (03:58 +0000)]
Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev
Jeff Sharkey [Wed, 29 Jul 2015 01:34:42 +0000 (01:34 +0000)]
am
b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit '
b8040265dd0d5a2a96e0850623647dad2f528db1':
Give secondary users read-only physical cards.
Jeff Sharkey [Wed, 29 Jul 2015 01:19:43 +0000 (01:19 +0000)]
Merge "Give secondary users read-only physical cards." into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 01:07:13 +0000 (18:07 -0700)]
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
Ronghua Wu [Wed, 29 Jul 2015 01:00:50 +0000 (01:00 +0000)]
am
02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
* commit '
02022b70bef7d6964bc8043385531d1aa97fb15b':
media: fix estimateFrameRatesFor to use correct ratio
Dianne Hackborn [Wed, 29 Jul 2015 01:00:45 +0000 (01:00 +0000)]
am
b310c894: Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
* commit '
b310c8945330a0a94abae34451e0bdc227f52035':
Fix issue #
22802691: APR: NPE in ActivityRecord
Dianne Hackborn [Wed, 29 Jul 2015 01:00:41 +0000 (01:00 +0000)]
am
5b009d52: Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
* commit '
5b009d523c6ad89f946e4a19f3fdba3c63bcf1f5':
Fix issue #
22802617: APR: spurious wtf when restarting a persistent process
Dianne Hackborn [Wed, 29 Jul 2015 01:00:37 +0000 (01:00 +0000)]
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
Ronghua Wu [Wed, 29 Jul 2015 00:53:12 +0000 (00:53 +0000)]
Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:47:33 +0000 (00:47 +0000)]
Merge "Fix issue #
22802691: APR: NPE in ActivityRecord" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:46:20 +0000 (00:46 +0000)]
Merge "Fix issue #
22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:45:18 +0000 (00:45 +0000)]
Merge "Fix issue #
22802782: APR: NPE in package manager with bad intent data" into mnc-dev
Adam Lesinski [Wed, 29 Jul 2015 00:41:03 +0000 (00:41 +0000)]
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
Jason Monk [Wed, 29 Jul 2015 00:40:58 +0000 (00:40 +0000)]
am
fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev
* commit '
fbcbad138d1b4c55e86ff671821b4feb7fc48f50':
Add sizes to SysUI tests
Aravind Akella [Wed, 29 Jul 2015 00:40:53 +0000 (00:40 +0000)]
am
15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev
* commit '
15938235d25a879ebb000cb3671fd75cb092e981':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Dianne Hackborn [Wed, 29 Jul 2015 00:40:06 +0000 (17:40 -0700)]
Fix issue #
22802691: APR: NPE in ActivityRecord
Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da
Adam Lesinski [Wed, 29 Jul 2015 00:34:38 +0000 (00:34 +0000)]
Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
Jason Monk [Wed, 29 Jul 2015 00:31:16 +0000 (00:31 +0000)]
Merge "Add sizes to SysUI tests" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:30:59 +0000 (17:30 -0700)]
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