OSDN Git Service
Jeff Sharkey [Wed, 15 Jul 2015 21:59:31 +0000 (21:59 +0000)]
am
350b99c0: am
483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '
350b99c0027902db22004ea037265349155d7c38':
Only send EXTRA_STACK for private intent.
Jim Miller [Wed, 15 Jul 2015 21:59:27 +0000 (21:59 +0000)]
am
c7b0435c: resolved conflicts for merge of
1d4247c4 to mnc-dr-dev
* commit '
c7b0435cc709c328da8e2b515ea04c8bc40d1094':
Improve tracking of screen on reasons.
Jeff Sharkey [Wed, 15 Jul 2015 21:43:48 +0000 (21:43 +0000)]
am
483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '
483bd84280ef667e306ec7246d85423ca6b1fde7':
Only send EXTRA_STACK for private intent.
Jim Miller [Wed, 15 Jul 2015 21:33:10 +0000 (14:33 -0700)]
resolved conflicts for merge of
1d4247c4 to mnc-dr-dev
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
Anthony Hugh [Tue, 23 Jun 2015 17:44:17 +0000 (10:44 -0700)]
DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG:
21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
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:11:05 +0000 (17:11 +0000)]
Merge "Improve tracking of screen on reasons." into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 17:08:46 +0000 (17:08 +0000)]
am
2fc3216e: (-s ours) am
facfbc52: (-s ours) Import translations. DO NOT MERGE
* commit '
2fc3216e2f8b77116594ca5cda2e927c43094039':
Import translations. DO NOT MERGE
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
Geoff Mendal [Wed, 15 Jul 2015 16:54:17 +0000 (16:54 +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 16:10:11 +0000 (16:10 +0000)]
am
f99a1399: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
f99a13992d03850c29401d2ad39a985cf277cc86':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 16:10:06 +0000 (16:10 +0000)]
am
1b379b2b: (-s ours) am
b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
1b379b2bf4258aec584884ede52e501cbb142d60':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 15:59:31 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 15 Jul 2015 15:57:39 +0000 (15:57 +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:55:07 +0000 (10:55 -0500)]
Import translations. DO NOT MERGE
Change-Id: If03fa3692f5b0494d3255dbda93aab624f2e3b59
Auto-generated-cl: translation import
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:40:18 +0000 (14:40 +0000)]
am
91202e59: am
503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '
91202e5929dbaf5013dd0e641e4c9e98d9d3f256':
Fix input pause without resume.
Geoff Mendal [Wed, 15 Jul 2015 14:24:47 +0000 (14:24 +0000)]
am
fa4541da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
fa4541da009293a52fad1c8abee91682b3032029':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:24:43 +0000 (14:24 +0000)]
am
11b1579a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
11b1579a5f507fabedc6c2f0d7e48af79da93032':
Import translations. DO NOT MERGE
George Mount [Wed, 15 Jul 2015 14:24:18 +0000 (14:24 +0000)]
am
503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '
503ad9ee0d701d045c382cd534865f48f69c024b':
Fix input pause without resume.
Geoff Mendal [Wed, 15 Jul 2015 14:12:55 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
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 14:11:47 +0000 (14:11 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 15 Jul 2015 14:09:35 +0000 (14:09 +0000)]
am
35a682bf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
35a682bf9ff3b6b6e6cb83427f253d93c763fdc6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:09:31 +0000 (14:09 +0000)]
am
862ff6b6: (-s ours) am
94666b76: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
862ff6b6c8d513ca5cd79bb49194a5fe2543f9b5':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:09:27 +0000 (14:09 +0000)]
am
82ca8b0a: (-s ours) am
57d8be8b: (-s ours) Import translations. DO NOT MERGE
* commit '
82ca8b0a6b55d45cb92664983092faf738139bf8':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:05:22 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie56e8483ffa87f863bb76f29f73fcdeeb7b4b2b2
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 14:04:38 +0000 (07:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3dcb83456bc06643dd83016e764a1a71a8999656
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 14:03:40 +0000 (14:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 15 Jul 2015 14:01:17 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia22c5f2bb6f9dfc97e38af8fc3bffeda5086a4e4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 13:53:44 +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:40 +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:55:35 +0000 (02:55 +0000)]
am
5e078458: am
18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
* commit '
5e078458c2a0d21aae6aa28530aee665fe065906':
Relax strict ActionMode instance checking when finishing action modes
Adam Powell [Wed, 15 Jul 2015 02:43:10 +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
Dianne Hackborn [Wed, 15 Jul 2015 02:08:59 +0000 (02:08 +0000)]
am
aa7b1450: am
63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit '
aa7b14501a5ac7ac5a0ec1425589d8c2bfa6fc17':
Bump mms whitelist time up to 1 minute.
Dianne Hackborn [Wed, 15 Jul 2015 02:08:55 +0000 (02:08 +0000)]
am
aa3694f2: am
f1f8b9cc: Merge "Fix issue #
21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '
aa3694f2b3396f0ea9c9cccb7dbe8d5664e1e691':
Fix issue #
21626564: MMS should be receivied while Dozing
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
Fyodor Kupolov [Wed, 15 Jul 2015 01:58:02 +0000 (01:58 +0000)]
am
0e45f873: am
4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
* commit '
0e45f8737a2a14064301dacdd33d3e03adc6f273':
Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast
Eric Laurent [Wed, 15 Jul 2015 01:57:58 +0000 (01:57 +0000)]
am
c2db03b0: am
bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev
* commit '
c2db03b0b8627b177522db9e05d13112b9451b72':
AudioManager: fix audio device callback list access
Dianne Hackborn [Wed, 15 Jul 2015 01:57:25 +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:21 +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:02 +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:42:57 +0000 (01:42 +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 01:14:20 +0000 (01:14 +0000)]
am
189f3136: am
98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '
189f3136610809ea284d895be0e04bb87561370d':
Added sendBroadcastMultiplePermissions method
Fyodor Kupolov [Wed, 15 Jul 2015 01:00:44 +0000 (01:00 +0000)]
am
98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '
987241265b77542f45ce95838c25beeaf3ae6849':
Added sendBroadcastMultiplePermissions method
Adam Lesinski [Wed, 15 Jul 2015 00:53:01 +0000 (00:53 +0000)]
am
e5c0550d: am
267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
* commit '
e5c0550dfe4089e10148a5208cd18a0eadbe8bbe':
BatteryStats: Clear power use when removing a UID from uid_cputime kernel module
Adam Lesinski [Wed, 15 Jul 2015 00:52:57 +0000 (00:52 +0000)]
am
903ebd15: am
56d82dd2: BatteryStats: Fix deadlock
* commit '
903ebd153b7503bf958eb91a3a67cad9f6f5a955':
BatteryStats: Fix deadlock
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:39:13 +0000 (00:39 +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:39:09 +0000 (00:39 +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:26:27 +0000 (23:26 +0000)]
am
d4d190ca: am
d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
* commit '
d4d190caed257afec060fe9d654059703a923d97':
BatteryStats: Fix units in wakelock distribution calculation
Yin-Chia Yeh [Tue, 14 Jul 2015 23:26:22 +0000 (23:26 +0000)]
am
9d513cec: am
b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
* commit '
9d513cec7c9721974d782471931d302281d3e898':
Camera: clarify largest JPEG dimension expectation
Fyodor Kupolov [Tue, 14 Jul 2015 23:26:18 +0000 (23:26 +0000)]
am
fc4acfd9: am
4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
* commit '
fc4acfd93c57277cb90774461e475a5032404d36':
Revert "Allow array of required permissions in sendBroadcast"
xinhe [Tue, 14 Jul 2015 23:26:13 +0000 (23:26 +0000)]
am
44ab51c6: am
f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
44ab51c635ba3f96f23366e5d57f9d1ad9857058':
Need to disable 5GHz bands for WiFi tethering in Japan
Adam Lesinski [Tue, 14 Jul 2015 23:13:43 +0000 (23:13 +0000)]
am
d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
* commit '
d4c1861a536d022b00505c75c30529c50688f26a':
BatteryStats: Fix units in wakelock distribution calculation
Yin-Chia Yeh [Tue, 14 Jul 2015 23:13:27 +0000 (23:13 +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 23:13:22 +0000 (23:13 +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"
xinhe [Tue, 14 Jul 2015 23:13:08 +0000 (23:13 +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
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:53:02 +0000 (22:53 +0000)]
Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
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: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:27:52 +0000 (22:27 +0000)]
am
95f270de: am
b63b031c: Merge "Standardize stateToString return values" into mnc-dev
* commit '
95f270de2fe62ca78f05ef7300bfef7e0bcbc7a5':
Standardize stateToString return values
Fyodor Kupolov [Tue, 14 Jul 2015 22:27:47 +0000 (22:27 +0000)]
am
ef77c116: am
d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
* commit '
ef77c116f3c1272f623627aec997c10c1432b03c':
Allow array of required permissions in sendBroadcast
Yorke Lee [Tue, 14 Jul 2015 22:12:04 +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:00 +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:28:27 +0000 (21:28 +0000)]
am
c7a60749: am
d3719ab0: Merge "Better handling of storage paths." into mnc-dev
* commit '
c7a607496aa5ba368524dd334877a9c428ab5f78':
Better handling of storage paths.
Chien-Yu Chen [Tue, 14 Jul 2015 21:28:23 +0000 (21:28 +0000)]
am
951e2633: am
6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev
* commit '
951e2633ebe5338a764bb8084c0c6f1166ace260':
Camera: Reconnect after camera service crashes
Jorim Jaggi [Tue, 14 Jul 2015 21:28:16 +0000 (21:28 +0000)]
am
4cfdcf5b: Touch, wake and unlock
* commit '
4cfdcf5b0551e5656ea379c428e78b812c2e5cbe':
Touch, wake and unlock
Jeff Sharkey [Tue, 14 Jul 2015 21:18:26 +0000 (21:18 +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:18:22 +0000 (21:18 +0000)]
am
6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev
* commit '
6eec00ecf456b8a24487828b6f515cccc465cc1a':
Camera: Reconnect after camera service crashes
Jorim Jaggi [Thu, 9 Jul 2015 19:13:59 +0000 (12:13 -0700)]
Touch, wake and unlock
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.
Bug:
21855614
Change-Id: I0c43bcc9d334b509632704fb0c123ab3351edff2
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:42:56 +0000 (20:42 +0000)]
am
a05e7ac2: am
5cf30c60: Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev
* commit '
a05e7ac245c941763c42fcefdb4a342d0e4a9359':
Pass wifi ap state through to tile when receiver triggered.
Andrew Solovay [Tue, 14 Jul 2015 20:42:51 +0000 (20:42 +0000)]
am
90adb81b: am
353886b2: am
e67416ec: am
4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
* commit '
90adb81b6c19e16dc699fa65748b577710f6a12e':
docs: Clarified how to find out when a switch is toggled
Jason Monk [Tue, 14 Jul 2015 20:42:46 +0000 (20:42 +0000)]
am
41904c99: am
fb973240: Merge "Fix status bar bt accessibility message" into mnc-dev
* commit '
41904c99c2cf9184eadccff2183b8682f844faf6':
Fix status bar bt accessibility message
Jason Monk [Tue, 14 Jul 2015 20:42:41 +0000 (20:42 +0000)]
am
a7542155: am
2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev
* commit '
a75421557651d7016124f8ed1fa5c0bab834d121':
Move wifi accessibility strings to SettingsLib
Adam Lesinski [Tue, 14 Jul 2015 20:37:23 +0000 (20:37 +0000)]
am
ba7e39d5: am
92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
* commit '
ba7e39d53a49a1a86d5ec1b5ce66ce56b30c7e66':
BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
OSDN Git Service
