OSDN Git Service
Geoff Mendal [Wed, 15 Jul 2015 21:54:56 +0000 (21:54 +0000)]
am
a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:54:49 +0000 (21:54 +0000)]
am
ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ff994bd31b2768eb38efb6c623f0fb6e13d9d61b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:54:42 +0000 (21:54 +0000)]
am
36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
36c103d685a6ba0f04c52bad2cb666789f5179dc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:54:35 +0000 (21:54 +0000)]
am
e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e2a0d44c8a837ac44dfc627ef3ca8d5242e78959':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:48:18 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:47:12 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:44:00 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:41:14 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jorim Jaggi [Wed, 15 Jul 2015 21:24:14 +0000 (21:24 +0000)]
am
eea8be53: Adjust assist disclosure stroke width to spec
* commit '
eea8be533874f279016279cd68618a6592b3dbed':
Adjust assist disclosure stroke width to spec
Jorim Jaggi [Tue, 14 Jul 2015 19:44:12 +0000 (12:44 -0700)]
Adjust assist disclosure stroke width to spec
Bug:
21568059
Change-Id: Ib1ddb8890715b98d36ed5827f053970a9d4a7173
Geoff Mendal [Wed, 15 Jul 2015 20:59:16 +0000 (13:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a4734ab26f74e593ace500f8ff19d280cf7a6a1
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 20:56:28 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4f6e47dc83c9fea23c61f43f791460d4bc5cc4ca
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 20:50:55 +0000 (13:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I37b181b340777aed3cb07cfb88c0e69803f4826a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 20:48:05 +0000 (13:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31dfaa6cbd223dfda3fa841edcb0f62ea576ffb2
Auto-generated-cl: translation import
Roshan Pius [Wed, 15 Jul 2015 19:38:12 +0000 (19:38 +0000)]
am
4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev
* commit '
4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
Handle exceptions when accessing Content providers.
Roshan Pius [Wed, 15 Jul 2015 19:23:28 +0000 (19:23 +0000)]
Merge "Handle exceptions when accessing Content providers." into mnc-dev
Felipe Leme [Wed, 15 Jul 2015 19:10:19 +0000 (19:10 +0000)]
am
68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
* commit '
68fd7c798d213bbe304775b13d775ee868abb448':
Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
Dianne Hackborn [Wed, 15 Jul 2015 19:03:28 +0000 (19:03 +0000)]
am
d193916c: Merge "Fix build." into mnc-dev
* commit '
d193916c83015d54466ad998fb9373f15da754a7':
Fix build.
Jeff Brown [Wed, 15 Jul 2015 19:03:21 +0000 (19:03 +0000)]
am
76c4c666: Add USB port manager.
* commit '
76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
Add USB port manager.
Jeff Brown [Wed, 15 Jul 2015 19:03:15 +0000 (19:03 +0000)]
am
2dbccc19: Clean up USB Manager dump.
* commit '
2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
Clean up USB Manager dump.
Felipe Leme [Wed, 15 Jul 2015 19:00:41 +0000 (19:00 +0000)]
Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 18:59:18 +0000 (18:59 +0000)]
Merge "Fix build." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 18:58:27 +0000 (11:58 -0700)]
Fix build.
Change-Id: Ib165c32d1d87e971902b4dd7300ccebd65e71a7d
Jeff Brown [Tue, 7 Jul 2015 19:44:17 +0000 (12:44 -0700)]
Add USB port manager.
Add some new internal APIs to enumerate USB Type C ports, query their
status, determine whether they support changing power or data roles,
and doing so. The API also adds a new ACTION_USB_PORT_CHANGED broadcast
for port state changes.
The implementation includes a mechanism for simulating the behavior
of the USB stack. See 'adb shell dumpsys usb -h' for details.
Note that the underlying kernel driver interface is still subject
to change but its behavior has been encapsulated as much as possible.
Bug:
21615151
Change-Id: I0c853ae179248a4550b3e60d02a7a7e65e4546b2
Jeff Brown [Tue, 7 Jul 2015 19:40:53 +0000 (12:40 -0700)]
Clean up USB Manager dump.
Tidy up the dump() implementation in preparation for further work.
Bug:
21615151
Change-Id: If6d94c8dc9457b8e93103541ec1798981eeb5b54
Jeff Sharkey [Wed, 15 Jul 2015 18:10:53 +0000 (18:10 +0000)]
am
539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev
* commit '
539f7ac7a195c405987057ef34e88cfbe8eab5e8':
Give DCS permission needed to measure all users.
Jeff Sharkey [Wed, 15 Jul 2015 18:10:47 +0000 (18:10 +0000)]
am
483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '
483bd84280ef667e306ec7246d85423ca6b1fde7':
Only send EXTRA_STACK for private intent.
Jeff Sharkey [Wed, 15 Jul 2015 18:02:59 +0000 (18:02 +0000)]
Merge "Give DCS permission needed to measure all users." into mnc-dev
Jeff Sharkey [Wed, 15 Jul 2015 18:02:53 +0000 (18:02 +0000)]
Merge "Only send EXTRA_STACK for private intent." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 17:25:01 +0000 (17:25 +0000)]
am
1d4247c4: Merge "Improve tracking of screen on reasons." into mnc-dev
* commit '
1d4247c4cc89c6d62e44ed3115f26579979b44b5':
Improve tracking of screen on reasons.
Dianne Hackborn [Wed, 15 Jul 2015 17:11:05 +0000 (17:11 +0000)]
Merge "Improve tracking of screen on reasons." into mnc-dev
Dianne Hackborn [Mon, 13 Jul 2015 21:48:08 +0000 (14:48 -0700)]
Improve tracking of screen on reasons.
- New screen on app op to record the last time each app has
caused the screen to be turned on.
- New battery stats event that tells us the reason the screen
has been asked to turn on.
- Propagate out power manager API to specify the reason a caller
is asking to have the screen turned on.
Note that currently the window flag to turn the screen on bypasses
much of this because it is being handled in the window manager by
just directly telling the power manager to turn the screen on. To
make this better we need a new API where it can specify who it is
calling the API for.
Change-Id: I667e56cb1f80508d054da004db667efbcc22e971
Jeff Sharkey [Wed, 15 Jul 2015 16:58:22 +0000 (09:58 -0700)]
Give DCS permission needed to measure all users.
DCS runs as owner user, but needs to measure details for other users
on the device.
Bug:
22503636
Change-Id: I6d6899fae90c4e92b94647676bda8b88bad412e6
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
Jeff Sharkey [Wed, 15 Jul 2015 16:13:14 +0000 (09:13 -0700)]
Only send EXTRA_STACK for private intent.
Since it's a private Parcelable class, we can't send it to other
third-party apps, since they won't know how to unpack it.
Bug:
22255387
Change-Id: Ie2ea6cf72b733bd122eb3581a5df295cec608425
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