OSDN Git Service
Geoff Mendal [Wed, 15 Jul 2015 16:53:38 +0000 (16:53 +0000)]
am
facfbc52: (-s ours) Import translations. DO NOT MERGE
* commit '
facfbc52d863b11138d7c67087f9b6b0e81765f9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 16:30:20 +0000 (11:30 -0500)]
Import translations. DO NOT MERGE
Change-Id: I54d30125585b48fa3d419a991802ce6152b9cbcd
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 15:58:00 +0000 (15:58 +0000)]
am
b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b4ac0141b01d98f0d750d9303a670b17e2f76f37':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 15:46:59 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 15:43:54 +0000 (10:43 -0500)]
Import translations. DO NOT MERGE
Change-Id: I03908869f5a297a5400488f13e57999c4e883db0
Auto-generated-cl: translation import
George Mount [Wed, 15 Jul 2015 14:24:35 +0000 (14:24 +0000)]
am
503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '
503ad9ee0d701d045c382cd534865f48f69c024b':
Fix input pause without resume.
George Mount [Wed, 15 Jul 2015 14:12:26 +0000 (14:12 +0000)]
Merge "Fix input pause without resume." into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 13:53:42 +0000 (13:53 +0000)]
am
94666b76: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
94666b76988a6a6721a0d5c080f819580da912a2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 13:53:36 +0000 (13:53 +0000)]
am
57d8be8b: (-s ours) Import translations. DO NOT MERGE
* commit '
57d8be8bc016f088af9ad76e19f72d3bbe4ff325':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 13:48:51 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 13:47:39 +0000 (06:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e7c446cc9fd0a34b81173a74cddc40c22b7b74b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 13:42:54 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic93e9b866c3f933bab929f480a6b8098e585ed9c
Auto-generated-cl: translation import
Adam Powell [Wed, 15 Jul 2015 02:43:15 +0000 (02:43 +0000)]
am
18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
* commit '
18709f9a0095afe6dba11f9dd71e3210c5f4e1db':
Relax strict ActionMode instance checking when finishing action modes
Adam Powell [Wed, 15 Jul 2015 02:31:18 +0000 (02:31 +0000)]
Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
Adam Powell [Wed, 15 Jul 2015 02:08:39 +0000 (19:08 -0700)]
Relax strict ActionMode instance checking when finishing action modes
In previous platform versions, finishing an action mode would clean up
the current action mode even if it was not the same ActionMode
instance. Some common shared code inadvertently relied on this
behavior, so stay bug-compatible with it based on targetSdkVersion.
New apps will get the stricter behavior.
Bug
22265882
Change-Id: Id5d6341aefc07a3cb788d5d6d0b531816f761e42
Dianne Hackborn [Wed, 15 Jul 2015 01:57:57 +0000 (01:57 +0000)]
am
63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit '
63461e61b9aba2514fb39f87b8741b6db1f7e5d7':
Bump mms whitelist time up to 1 minute.
Dianne Hackborn [Wed, 15 Jul 2015 01:57:51 +0000 (01:57 +0000)]
am
f1f8b9cc: Merge "Fix issue #
21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '
f1f8b9cc3ff5774e695568e8f02b018c0fd02844':
Fix issue #
21626564: MMS should be receivied while Dozing
Dianne Hackborn [Wed, 15 Jul 2015 01:49:52 +0000 (01:49 +0000)]
Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 01:48:07 +0000 (18:48 -0700)]
Bump mms whitelist time up to 1 minute.
Change-Id: I09074c440430580fcfb2581275defe61c63c8ae8
Dianne Hackborn [Wed, 15 Jul 2015 01:45:30 +0000 (01:45 +0000)]
Merge "Fix issue #
21626564: MMS should be receivied while Dozing" into mnc-dev
Fyodor Kupolov [Wed, 15 Jul 2015 01:43:18 +0000 (01:43 +0000)]
am
4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
* commit '
4044440d2c1a9d185a3379b88d88c96f8e234887':
Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
Eric Laurent [Wed, 15 Jul 2015 01:43:10 +0000 (01:43 +0000)]
am
bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev
* commit '
bd874b8be717110148e2b284f35d166b11c1fe7d':
AudioManager: fix audio device callback list access
Fyodor Kupolov [Wed, 15 Jul 2015 01:34:37 +0000 (01:34 +0000)]
Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
Dianne Hackborn [Tue, 14 Jul 2015 01:00:37 +0000 (18:00 -0700)]
Fix issue #
21626564: MMS should be receivied while Dozing
We now place whoever is receiving the MMS on the temporary
whitelist while doing so, so they can get network access to
download it.
There was also an issue that needed to be fixed where we
were no longer updating the list of allowed uids while
dozing based on their proc states... we now do that.
Also did a bit of optimization of the temp white list update
path do the network policy manager, instead of going through
a broadcast we now directly call in to the network policy
manager. This also allows us to have a synchronous version
of updating the list, so we can know the app has network access
before we tell it to do anything.
Finally added battery stats events for things going on and off
the whitelist so we can diagnose the behavior there.
Change-Id: Ic7fe010af680034d9f8cb014bb135b2addef7455
Eric Laurent [Wed, 15 Jul 2015 01:31:44 +0000 (01:31 +0000)]
Merge "AudioManager: fix audio device callback list access" into mnc-dev
Fyodor Kupolov [Wed, 15 Jul 2015 00:59:47 +0000 (00:59 +0000)]
am
98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '
987241265b77542f45ce95838c25beeaf3ae6849':
Added sendBroadcastMultiplePermissions method
Fyodor Kupolov [Wed, 15 Jul 2015 00:48:37 +0000 (00:48 +0000)]
Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
Adam Lesinski [Wed, 15 Jul 2015 00:38:37 +0000 (00:38 +0000)]
am
267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
* commit '
267240f2ddbaa0ea2828d7466f310c6ffc7c91cd':
BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
Adam Lesinski [Wed, 15 Jul 2015 00:38:31 +0000 (00:38 +0000)]
am
56d82dd2: BatteryStats: Fix deadlock
* commit '
56d82dd28a3c7dcca9c9dc37a73a1cf5fc44498e':
BatteryStats: Fix deadlock
Adam Lesinski [Wed, 15 Jul 2015 00:30:17 +0000 (00:30 +0000)]
Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
Fyodor Kupolov [Tue, 14 Jul 2015 02:19:25 +0000 (19:19 -0700)]
Added sendBroadcastMultiplePermissions method
Added Context.sendBroadcastMultiplePermissions(Intent intent, String[]
receiverPermissions) method, which allows an array of required permissions
to be enforced.
Bug:
21852542
Change-Id: I27c9130e8f004b428452501ebc8a36aabde1f343
Adam Lesinski [Tue, 14 Jul 2015 23:27:40 +0000 (16:27 -0700)]
BatteryStats: Fix deadlock
Bug:
22486756
Change-Id: I20e10cc344b128bfa156c5aada93d3fb2b0fcaa3
Adam Lesinski [Tue, 14 Jul 2015 23:51:53 +0000 (16:51 -0700)]
BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
Bug:
22461683
Change-Id: Iffb847268d2872bd2a843e28dc41fa22b1e36828
Eric Laurent [Tue, 14 Jul 2015 23:27:54 +0000 (16:27 -0700)]
AudioManager: fix audio device callback list access
Bug:
22470616.
Change-Id: Ic59e8499557395dabe789b5fec9cb7c86c13d10c
Adam Lesinski [Tue, 14 Jul 2015 23:12:26 +0000 (23:12 +0000)]
am
d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
* commit '
d4c1861a536d022b00505c75c30529c50688f26a':
BatteryStats: Fix units in wakelock distribution calculation
Adam Lesinski [Tue, 14 Jul 2015 23:00:20 +0000 (23:00 +0000)]
Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
Yin-Chia Yeh [Tue, 14 Jul 2015 22:55:12 +0000 (22:55 +0000)]
am
b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
* commit '
b42cb352a350bac198470f65125aa151ecacff13':
Camera: clarify largest JPEG dimension expectation
Fyodor Kupolov [Tue, 14 Jul 2015 22:55:06 +0000 (22:55 +0000)]
am
4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
* commit '
4a817924ecb282eef48b06b92f8e1914edd6cec2':
Revert "Allow array of required permissions in sendBroadcast"
Narayan Kamath [Tue, 14 Jul 2015 22:53:14 +0000 (22:53 +0000)]
am
b9f170ff: am
b4db7923: Merge "Delete some obsolete test code."
* commit '
b9f170ff99a3ad25623bf20c77eb4f6173577c98':
Delete some obsolete test code.
Yin-Chia Yeh [Tue, 14 Jul 2015 22:53:02 +0000 (22:53 +0000)]
Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
Mathieu Chartier [Tue, 14 Jul 2015 22:53:05 +0000 (22:53 +0000)]
am
ad4a285a: am
ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
* commit '
ad4a285af619ea29f79dbe4da19061c49f24a8c9':
Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
Fyodor Kupolov [Tue, 14 Jul 2015 22:43:44 +0000 (22:43 +0000)]
Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
xinhe [Tue, 14 Jul 2015 22:40:43 +0000 (22:40 +0000)]
am
f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
f1c2a1f798fc029200291ca9d5bbedb1f483d428':
Need to disable 5GHz bands for WiFi tethering in Japan
xinhe [Tue, 14 Jul 2015 22:29:17 +0000 (22:29 +0000)]
Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
Fyodor Kupolov [Tue, 14 Jul 2015 22:29:21 +0000 (22:29 +0000)]
Revert "Allow array of required permissions in sendBroadcast"
This reverts commit
b4e7283c9afd9fb15ebd63f6ce9b75c9c1af658b.
Change-Id: Ie8390964bda5bdfa869cee8f46584043d8e7c664
Yorke Lee [Tue, 14 Jul 2015 22:12:38 +0000 (22:12 +0000)]
am
b63b031c: Merge "Standardize stateToString return values" into mnc-dev
* commit '
b63b031cb5b9338daa3de76ee9976ba493037d92':
Standardize stateToString return values
Fyodor Kupolov [Tue, 14 Jul 2015 22:12:30 +0000 (22:12 +0000)]
am
d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
* commit '
d69a82c107cea4aca87eecc3978e21ea9bc23c82':
Allow array of required permissions in sendBroadcast
Yorke Lee [Tue, 14 Jul 2015 22:00:20 +0000 (22:00 +0000)]
Merge "Standardize stateToString return values" into mnc-dev
Fyodor Kupolov [Tue, 14 Jul 2015 21:57:19 +0000 (21:57 +0000)]
Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
Jeff Sharkey [Tue, 14 Jul 2015 21:04:25 +0000 (21:04 +0000)]
am
d3719ab0: Merge "Better handling of storage paths." into mnc-dev
* commit '
d3719ab07a0ba66c019979ce19c45b77c4aae92e':
Better handling of storage paths.
Chien-Yu Chen [Tue, 14 Jul 2015 21:04:19 +0000 (21:04 +0000)]
am
6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev
* commit '
6eec00ecf456b8a24487828b6f515cccc465cc1a':
Camera: Reconnect after camera service crashes
Jeff Sharkey [Tue, 14 Jul 2015 20:52:20 +0000 (20:52 +0000)]
Merge "Better handling of storage paths." into mnc-dev
Chien-Yu Chen [Tue, 14 Jul 2015 20:48:54 +0000 (20:48 +0000)]
Merge "Camera: Reconnect after camera service crashes" into mnc-dev
Julia Reynolds [Tue, 14 Jul 2015 20:32:19 +0000 (20:32 +0000)]
am
5cf30c60: Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev
* commit '
5cf30c608f21a9685310e6cf7d5970c8b7fb36c8':
Pass wifi ap state through to tile when receiver triggered.
Andrew Solovay [Tue, 14 Jul 2015 20:32:12 +0000 (20:32 +0000)]
am
353886b2: am
e67416ec: am
4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
* commit '
353886b2dd1d6751d83469ddd3eb01dd0039231e':
docs: Clarified how to find out when a switch is toggled
Jason Monk [Tue, 14 Jul 2015 20:32:05 +0000 (20:32 +0000)]
am
fb973240: Merge "Fix status bar bt accessibility message" into mnc-dev
* commit '
fb9732409a5f419ec00ba7b76de94bbcbd971936':
Fix status bar bt accessibility message
Jason Monk [Tue, 14 Jul 2015 20:31:58 +0000 (20:31 +0000)]
am
2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev
* commit '
2061049d69390a7f4ace9b37bb983ebbb4caa678':
Move wifi accessibility strings to SettingsLib
Adam Lesinski [Tue, 14 Jul 2015 19:02:44 +0000 (12:02 -0700)]
BatteryStats: Fix units in wakelock distribution calculation
This is mostly for checkin stats, this is not used in any computation.
Bug:
22468534
Bug:
22391540
Change-Id: Ib3d0c86db5044092d3d76acf8f001337272af2ff
Julia Reynolds [Tue, 14 Jul 2015 20:23:48 +0000 (20:23 +0000)]
Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev
Andrew Solovay [Tue, 14 Jul 2015 20:22:59 +0000 (20:22 +0000)]
am
e67416ec: am
4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
* commit '
e67416eccc6092e2fce3619b2244deda36fabd26':
docs: Clarified how to find out when a switch is toggled
Adam Lesinski [Tue, 14 Jul 2015 20:22:33 +0000 (20:22 +0000)]
am
92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
* commit '
92a3914fb353b725646a96185d1c1daaf3977e7b':
BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
Jason Monk [Tue, 14 Jul 2015 20:21:06 +0000 (20:21 +0000)]
Merge "Fix status bar bt accessibility message" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 20:20:31 +0000 (20:20 +0000)]
Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev
Jason Monk [Tue, 14 Jul 2015 20:10:32 +0000 (16:10 -0400)]
Fix status bar bt accessibility message
Use the same description for both QS and status bar.
Bug:
20345203
Change-Id: I5789c1385d2240e1ad426a008e6e2192885ddc2b
Adam Lesinski [Tue, 14 Jul 2015 20:08:41 +0000 (20:08 +0000)]
Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
Jeff Sharkey [Mon, 13 Jul 2015 17:25:31 +0000 (10:25 -0700)]
Better handling of storage paths.
Give more details about why we failed to create storage paths, and
search for underlying volumes using canonical paths.
Bug:
22135060
Change-Id: I75d3584403ece310438b05f5b9fe72d94c9096c6
Andrew Solovay [Tue, 14 Jul 2015 20:08:00 +0000 (20:08 +0000)]
am
4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
* commit '
4859a6125bcf967cf97339b19f30d9788b971e02':
docs: Clarified how to find out when a switch is toggled
Andrew Solovay [Tue, 14 Jul 2015 19:59:05 +0000 (19:59 +0000)]
Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
Svetoslav [Tue, 14 Jul 2015 19:52:08 +0000 (19:52 +0000)]
am
8b6d5b6b: Merge "Clear binder id when determining external storage state" into mnc-dev
* commit '
8b6d5b6b6ac3c363ad7aa36873dec1701d33de1e':
Clear binder id when determining external storage state
Dan Sandler [Tue, 14 Jul 2015 19:52:02 +0000 (19:52 +0000)]
am
66cc6bb6: Merge "Allow notification strings to be unredacted in dump output." into mnc-dev
* commit '
66cc6bb65eac220a01b6a300cf64f1035a0463af':
Allow notification strings to be unredacted in dump output.
Fyodor Kupolov [Tue, 14 Jul 2015 02:19:25 +0000 (19:19 -0700)]
Allow array of required permissions in sendBroadcast
Added Context.sendBroadcast(Intent intent, String[] receiverPermissions)
method, which allows an array of required permissions to be enforced.
Bug:
21852542
Change-Id: I3b8ff258fa9f3249c344bb8093b820b24eef00c0
Svetoslav [Tue, 14 Jul 2015 19:39:13 +0000 (19:39 +0000)]
Merge "Clear binder id when determining external storage state" into mnc-dev
Dan Sandler [Tue, 14 Jul 2015 19:37:53 +0000 (19:37 +0000)]
Merge "Allow notification strings to be unredacted in dump output." into mnc-dev
Svetoslav [Tue, 14 Jul 2015 18:55:52 +0000 (18:55 +0000)]
am
46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-dev
* commit '
46d1864ceee7229cd7fe7bac80226c930539861d':
Make get_accounts a runtime permissions again
Svetoslav [Tue, 14 Jul 2015 18:42:05 +0000 (18:42 +0000)]
Merge "Make get_accounts a runtime permissions again" into mnc-dev
Yorke Lee [Tue, 14 Jul 2015 18:39:36 +0000 (11:39 -0700)]
Standardize stateToString return values
Bug:
20303674
Change-Id: I884029614c8ce36120c1fc039ef33c0e6736ed5c
Fyodor Kupolov [Tue, 14 Jul 2015 18:38:58 +0000 (11:38 -0700)]
Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
Receivers of ACTION_FOUND intent are now required to have
ACCESS_COARSE_LOCATION permission.
Bug:
21852542
Change-Id: I8306f7431f067ca36bfc568a912385153fa3d496
Selim Cinek [Tue, 14 Jul 2015 18:37:15 +0000 (18:37 +0000)]
am
f5adce87: Merge "Removed logging for the empty keyguard" into mnc-dev
* commit '
f5adce87581bd3b7e8fd2846a85dbbf8c0dca939':
Removed logging for the empty keyguard
Adam Lesinski [Tue, 14 Jul 2015 18:31:29 +0000 (11:31 -0700)]
BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
High cpu times are expected as multiple cores can be running at the
same time, so comparing against the time between samples is incorrect.
I am reasonable certain that the values we see now are correct, so disabling this
check. However, checking for negative values (overflows) is still enabled and
will remain enabled because there is no case where we will be ok with negative deltas.
Bug:
22461683
Change-Id: If9c7cdbb75ceaed059d1e0f4dd83cfdd3e021a93
Svetoslav [Tue, 14 Jul 2015 18:27:06 +0000 (11:27 -0700)]
Clear binder id when determining external storage state
bug:
22472435
Change-Id: I5badd51cb9fb2244395880eb1bbff8f4aa0abb8c
Selim Cinek [Tue, 14 Jul 2015 18:27:54 +0000 (18:27 +0000)]
Merge "Removed logging for the empty keyguard" into mnc-dev
Amit Mahajan [Tue, 14 Jul 2015 18:13:16 +0000 (18:13 +0000)]
am
51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
* commit '
51b4e97ae42fb789b7d1c9d4134ddaa7e2b27b11':
Add checks for READ_PRIVILEGED_PHONE_STATE.
Amit Mahajan [Tue, 14 Jul 2015 17:59:17 +0000 (17:59 +0000)]
Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
Julia Reynolds [Tue, 14 Jul 2015 17:36:30 +0000 (13:36 -0400)]
Pass wifi ap state through to tile when receiver triggered.
Bug:
22450078
Change-Id: I9b339aa2238a7427291bfdc2ef6aab58dcdb5cf3
Jason Monk [Tue, 14 Jul 2015 17:49:51 +0000 (17:49 +0000)]
am
fe03a84b: Merge "Fix QS labels on language change" into mnc-dev
* commit '
fe03a84bc6d59e9b09029cfa8800bd9ef8d85d18':
Fix QS labels on language change
Jason Monk [Tue, 14 Jul 2015 17:40:21 +0000 (17:40 +0000)]
Merge "Fix QS labels on language change" into mnc-dev
Marco Nelissen [Tue, 14 Jul 2015 17:35:22 +0000 (17:35 +0000)]
am
3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit '
3ced96178b1b132705e773736cbb707a3a0cd951':
Use original path if translated path doesn't exist
Craig Lafayette [Tue, 14 Jul 2015 17:35:15 +0000 (17:35 +0000)]
am
2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit '
2f0116fa3ab2153188e43e87b194afae7e4efb81':
Prevent null allowableAccounts from crashing
Jason Monk [Tue, 14 Jul 2015 17:32:33 +0000 (13:32 -0400)]
Move wifi accessibility strings to SettingsLib
Bug:
22468835
Change-Id: I66e85e8adfb3eda194995eda529422a172f00cbd
Marco Nelissen [Tue, 14 Jul 2015 17:30:03 +0000 (17:30 +0000)]
Merge "Use original path if translated path doesn't exist" into mnc-dev
Amit Mahajan [Tue, 14 Jul 2015 17:26:00 +0000 (10:26 -0700)]
Add checks for READ_PRIVILEGED_PHONE_STATE.
Callers will have either PRIVILEGED or regular READ_PHONE_STATE.
Bug:
22468536
Change-Id: I60251f61250a975f4147b027d2539824a728e3b5
Craig Lafayette [Tue, 14 Jul 2015 17:25:37 +0000 (17:25 +0000)]
Merge "Prevent null allowableAccounts from crashing" into mnc-dev
Chris Craik [Tue, 14 Jul 2015 17:13:23 +0000 (17:13 +0000)]
am
941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit '
941bcedb4c03832cd54225217697c7b8cba6e07c':
Fix unsafety in SkiaShader storage, and texture unit accounting
George Mount [Tue, 14 Jul 2015 17:03:06 +0000 (10:03 -0700)]
Fix input pause without resume.
Bug
22455206
Previously, when an exit activity transition was created, the input
would be paused. This worked fine as long as the transition was
run. However, sometimes that transition wasn't run and this would
cause the input to fail to be started again.
This fix moves the input pause to when the transition is started.
Change-Id: I738d5471f7932f00b50897f87a8f8a71ecbc57e2
Chris Craik [Tue, 14 Jul 2015 16:57:58 +0000 (16:57 +0000)]
Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
Alex Klyubin [Tue, 14 Jul 2015 16:30:41 +0000 (16:30 +0000)]
am
10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
* commit '
10633c96b55d13f05304b758b01be48035adece3':
Fix Android Keystore key factories to obey JCA contract.
Jason Monk [Tue, 14 Jul 2015 16:29:28 +0000 (12:29 -0400)]
Fix QS labels on language change
Some tiles now won't do updates if the state hasn't changed (rotation) to avoid
breaking the animation state. To handle this, state is cleared when the
configuration changes.
Bug:
22206214
Change-Id: I029fb4c75cc920a6c9907b65e8c48d28c21d529a
Alex Klyubin [Tue, 14 Jul 2015 16:15:58 +0000 (16:15 +0000)]
Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
Yohei Yukawa [Tue, 14 Jul 2015 15:44:37 +0000 (15:44 +0000)]
am
12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
* commit '
12952c79528cd7ea804c400e5908a24e56f69bbe':
Allow FloatingToolbar to be outside of the attached window.
Yohei Yukawa [Tue, 14 Jul 2015 15:34:29 +0000 (15:34 +0000)]
Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
OSDN Git Service
