OSDN Git Service
Jeff Sharkey [Fri, 4 Apr 2014 19:12:41 +0000 (12:12 -0700)]
Allow prefix-based Uri permission grants.
Define new FLAG_GRANT_PREFIX_URI_PERMISSION which indicates that a
Uri permission grant should also apply to any other Uris that have
matching scheme, authority, and path segments. For example, a prefix
grant for /foo/ would allow /foo/bar/ but not /foo2/.
Allow persistable and prefix grants to be issued directly through
grantUriPermission(). Relaxing persistable is fine, since it still
requires the receiver to actively take the permission.
Since exact- and prefix-match grants for the same Uri can coexist,
we track them separately using a new UriGrant key. (Consider the
case where an app separately extends READ|PREFIX and WRITE for
the same Uri: we can't let that become READ|WRITE|PREFIX.)
Fix revoke to always take away persisted permissions. Move prefix
matching logic to Uri and add tests. Add new flags to "am" tool, and
various internal uses around Intent and Context. Switch some lagging
users to ArraySet.
Bug:
10607375
Change-Id: Ia8ce2b88421ff9f2fe5a979a27a026fc445d46f1
Andrew Solovay [Wed, 23 Apr 2014 02:55:21 +0000 (02:55 +0000)]
am
e4593554: am
32117212: am
6c5bfa2f: am
026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '
e4593554ddcdaeb93a6d624fbd6641c4624de536':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
Andrew Solovay [Wed, 23 Apr 2014 02:51:48 +0000 (02:51 +0000)]
am
32117212: am
6c5bfa2f: am
026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '
32117212fc48872b557044ff25ba6b8d9ace5738':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
Andrew Solovay [Wed, 23 Apr 2014 02:47:50 +0000 (02:47 +0000)]
am
6c5bfa2f: am
026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '
6c5bfa2f348f1d55cbff5f8f2bd61e88ac2d01ee':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
Andrew Solovay [Wed, 23 Apr 2014 02:44:06 +0000 (02:44 +0000)]
am
026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
* commit '
026c82b1916a9e2b48b9ff62ffeb935d63935a68':
Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
Andrew Solovay [Tue, 22 Apr 2014 22:46:42 +0000 (15:46 -0700)]
Doc: Fixed a code sample to use standard methods. Also some formatting
tweaks.
Added blank lines for readability, and broke some long lines
so code samples don't need a scroll bar.
(Update: Fixed indentation that I broke on a code sample.)
Bug:
14045051
Change-Id: I1cf08b899ec55f9093545e71861c84120e4b56a1
Baligh Uddin [Wed, 23 Apr 2014 02:20:28 +0000 (02:20 +0000)]
am
128f5efa: (-s ours) am
89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
128f5efa7680b0a21e17c1a7ad7351ee031a4fd1':
Import translations. DO NOT MERGE
Alan Viverette [Wed, 23 Apr 2014 02:19:20 +0000 (02:19 +0000)]
Merge "Add ripple to switches, radio buttons, check boxes, seek bars"
Baligh Uddin [Wed, 23 Apr 2014 02:15:35 +0000 (02:15 +0000)]
am
97f9607f: (-s ours) am
d14bb3cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
97f9607fccaa958c2e9304f3d2f2157fa6e1a694':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:31 +0000 (02:15 +0000)]
am
b38d00d5: (-s ours) am
abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b38d00d5793bcb176683f89f70ae36768373fe49':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:28 +0000 (02:15 +0000)]
am
c1c6de3f: (-s ours) am
c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
c1c6de3f918d4feb7c60534fe2fc76566a7aa215':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:24 +0000 (02:15 +0000)]
am
6c8e9296: (-s ours) am
13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
6c8e9296c35ec88b5093d4f5553252ee0f244141':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:21 +0000 (02:15 +0000)]
am
e22700ac: (-s ours) am
611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
e22700ac5bda54aed59193b6f8fad838830ab0aa':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:17 +0000 (02:15 +0000)]
am
9ee5df4b: (-s ours) am
4516c695: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
9ee5df4b126d9f61dd5deeff60e5682d3acfa699':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:13 +0000 (02:15 +0000)]
am
0d0bbe4e: (-s ours) am
2d45d4de: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
0d0bbe4e1280bdd51529fd84e9e4a5bedfbc806e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:10 +0000 (02:15 +0000)]
am
c72133a4: (-s ours) am
5eb7136d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
c72133a485459bdb85e8401ad3b4335ae1e2fbea':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:06 +0000 (02:15 +0000)]
am
ed8c4096: (-s ours) am
71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
ed8c4096192b247d431bde149518ef87ba7e331a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:15:03 +0000 (02:15 +0000)]
am
44cbb9f2: (-s ours) am
2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
44cbb9f2294184c28542300d2b3e3f0b1ff96178':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:14:59 +0000 (02:14 +0000)]
am
b491f832: (-s ours) am
42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b491f8323893fb751a1b1291ec3f66cdb73ed8c2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:14:55 +0000 (02:14 +0000)]
am
61f9ac26: (-s ours) am
9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
61f9ac26fdc1f044c8a5b1541babcffe88ba548b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:13:29 +0000 (02:13 +0000)]
am
89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
89ed56fa6c5951e4ce7ea555ae8f90c65b2daa2d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:22 +0000 (02:08 +0000)]
am
d14bb3cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
d14bb3cfb95e5bebb181ec9ed08295f25b87a94f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:19 +0000 (02:08 +0000)]
am
abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
abd2a4a44923c28111bdf9ccb59e5557f0deafeb':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:13 +0000 (02:08 +0000)]
am
c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
c2c527a6f4b3629ea271ef5444292a02e2d9a17e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:10 +0000 (02:08 +0000)]
am
13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
13c48fba164a977bbf4ef64434427bab297421bf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:07 +0000 (02:08 +0000)]
am
611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
611dd7b70a809ac766e4e1675a4ae1a115cf6cdf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:04 +0000 (02:08 +0000)]
am
4516c695: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
4516c695b2d8fdbc7dc0427a98841805e47f1e16':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:00 +0000 (02:08 +0000)]
am
2d45d4de: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
2d45d4de489563907aebe8bb29c3b965749fe81e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:57 +0000 (02:07 +0000)]
am
5eb7136d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
5eb7136de95111983bef2357e2543730f66cde03':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:54 +0000 (02:07 +0000)]
am
71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:51 +0000 (02:07 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:07:51 +0000 (02:07 +0000)]
am
2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
2d6e077d1db0da9a008ff6014ebbb555c30a7c47':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:48 +0000 (02:07 +0000)]
am
42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
42c0488a4b4db802161dc60a0bd16d2e5bc6afbe':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:45 +0000 (02:07 +0000)]
am
9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
9dbd2eebf9095c4513b333a1ccce12e7d4523bd1':
Import translations. DO NOT MERGE
Alan Viverette [Wed, 23 Apr 2014 02:07:06 +0000 (19:07 -0700)]
Add ripple to switches, radio buttons, check boxes, seek bars
BUG:
14231772
Change-Id: Ie40eac9f68815294460175965a999dd75f4144b5
Baligh Uddin [Wed, 23 Apr 2014 02:01:08 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:06 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:03 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:02 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:59 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:57 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:55 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:54 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:49 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:47 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:43 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:41 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Jeff Brown [Wed, 23 Apr 2014 01:25:40 +0000 (01:25 +0000)]
am
62271b95: am
3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
* commit '
62271b95222c5d67868ac1b3bbd8851d4fa18454':
Fix HDMI hotplug display blanking behavior.
Jeff Brown [Wed, 23 Apr 2014 01:22:26 +0000 (01:22 +0000)]
am
3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
* commit '
3af392674969b17cd3719f49ae597c7dc6ee6614':
Fix HDMI hotplug display blanking behavior.
Jeff Brown [Wed, 23 Apr 2014 01:20:01 +0000 (01:20 +0000)]
Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
Jeff Brown [Wed, 23 Apr 2014 01:07:24 +0000 (18:07 -0700)]
Fix HDMI hotplug display blanking behavior.
Bug:
14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
Baligh Uddin [Wed, 23 Apr 2014 00:54:46 +0000 (17:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieceadfdafb3e1353a30494c8a9731efcf91b9e8b
Auto-generated-cl: translation import
Ying Wang [Wed, 23 Apr 2014 00:15:52 +0000 (00:15 +0000)]
am
d12bf275: am
d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
* commit '
d12bf27575bc2df114abc0aadd1a62ff476b5a42':
Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
Baligh Uddin [Wed, 23 Apr 2014 00:12:07 +0000 (17:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae8e8f588200714d11fe7dced5aab7ec63181e8f
Auto-generated-cl: translation import
Ying Wang [Wed, 23 Apr 2014 00:11:52 +0000 (00:11 +0000)]
am
d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
* commit '
d0dc898119fc43de89ff41e39d37961dacab4eaa':
Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
Baligh Uddin [Wed, 23 Apr 2014 00:11:22 +0000 (17:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf24bec3b74bbe1abc88c2a3c2da451be9ed5c02
Auto-generated-cl: translation import
Ying Wang [Wed, 23 Apr 2014 00:10:01 +0000 (00:10 +0000)]
Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 00:09:18 +0000 (17:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3106f51a639078291c298ca4bbd75062e788a313
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:08:37 +0000 (17:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1aa31fe5b005c2cdef0b250806d682141cdf4fc3
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:05:01 +0000 (17:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I236254c3ae3302004f19821a7d7022ae49f6e908
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:04:17 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia514ffa26785292a7659a5e3950cc3125d50736e
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:03:26 +0000 (17:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5867f9bda8854f34ee138c135c46219d36e9be49
Auto-generated-cl: translation import
Michael Wright [Wed, 23 Apr 2014 00:02:02 +0000 (00:02 +0000)]
Merge "Add ViewRootImpl#unhandledInputEvent API stub."
Michael Wright [Wed, 23 Apr 2014 00:00:11 +0000 (17:00 -0700)]
Add ViewRootImpl#unhandledInputEvent API stub.
Doesn't actually work yet for non-KeyEvents.
Change-Id: I3482ff780a9a7aef8ae27436f91a3619490b369f
Igor Murashkin [Tue, 22 Apr 2014 23:56:12 +0000 (23:56 +0000)]
Merge "camera2: Fix broken camera metadata test due to key rename"
Deepanshu Gupta [Tue, 22 Apr 2014 23:47:58 +0000 (23:47 +0000)]
Merge "Update Matrix_Delegate native methods."
Baligh Uddin [Tue, 22 Apr 2014 23:39:03 +0000 (16:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib7d1feda99c656bcea0c0efc41e9f04bda7049b9
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:37:07 +0000 (16:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ac555548303cd6b32be846c0479bbe78a977c3a
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:36:32 +0000 (16:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae11d6890917425aa6c6269d46372f4e6d6c08a2
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:35:44 +0000 (16:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I757cae4af2ba6dfac51383bf48f17708e44adf6f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:35:06 +0000 (16:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idc8ada2c34c0846b4ad8c3094e78d6beff2cc38e
Auto-generated-cl: translation import
Igor Murashkin [Tue, 22 Apr 2014 23:29:14 +0000 (16:29 -0700)]
camera2: Fix broken camera metadata test due to key rename
Change-Id: I0367550b5bb9f80c8df272804eab7052c122104d
Deepanshu Gupta [Tue, 22 Apr 2014 23:19:13 +0000 (23:19 +0000)]
am
be06a418: am
cf5c3fc7: am
53b7df19: Merge "Add missing ICU_Delegate methods."
* commit '
be06a4182b9ff44a276f56d04b907672ee9e149a':
Add missing ICU_Delegate methods.
Deepanshu Gupta [Tue, 22 Apr 2014 23:15:05 +0000 (23:15 +0000)]
am
cf5c3fc7: am
53b7df19: Merge "Add missing ICU_Delegate methods."
* commit '
cf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f':
Add missing ICU_Delegate methods.
Deepanshu Gupta [Tue, 22 Apr 2014 23:10:40 +0000 (23:10 +0000)]
am
53b7df19: Merge "Add missing ICU_Delegate methods."
* commit '
53b7df19cf287ea48b2ce27ab9cd7ddbc3d04330':
Add missing ICU_Delegate methods.
Deepanshu Gupta [Tue, 22 Apr 2014 23:08:05 +0000 (23:08 +0000)]
Merge "Add missing ICU_Delegate methods."
Victoria Lease [Tue, 22 Apr 2014 23:01:05 +0000 (23:01 +0000)]
am
2c423b22: am
df64ac68: ask skia to use flat gamma when rendering fonts from hwui
* commit '
2c423b22b42269c0652dff4155707cec823fbfc1':
ask skia to use flat gamma when rendering fonts from hwui
Victoria Lease [Tue, 22 Apr 2014 22:57:29 +0000 (22:57 +0000)]
am
df64ac68: ask skia to use flat gamma when rendering fonts from hwui
* commit '
df64ac688d400c74438db091952d236fffd5f778':
ask skia to use flat gamma when rendering fonts from hwui
Victoria Lease [Tue, 22 Apr 2014 22:00:31 +0000 (15:00 -0700)]
ask skia to use flat gamma when rendering fonts from hwui
Bug:
13748392
Change-Id: I6930629b8e900628f15354f663b86dfb29a4db78
(cherry picked from commit
b66270eac288de53207e55d10879b070a0ec8b6b)
Victoria Lease [Tue, 22 Apr 2014 22:37:36 +0000 (22:37 +0000)]
Merge "ask skia to use flat gamma when rendering fonts from hwui"
Ying Wang [Tue, 22 Apr 2014 22:20:16 +0000 (15:20 -0700)]
Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
It looks like a Javac bug.
Bug:
14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392
Victoria Lease [Tue, 22 Apr 2014 22:00:31 +0000 (15:00 -0700)]
ask skia to use flat gamma when rendering fonts from hwui
Bug:
13748392
Change-Id: I6930629b8e900628f15354f663b86dfb29a4db78
Nick Kralevich [Tue, 22 Apr 2014 21:21:02 +0000 (21:21 +0000)]
am
9a492393: am
5246f459: am
d267c1a0: Merge "remove unneeded import statements."
* commit '
9a492393dfb69050b2a4a8b5205e8d2fc24fcd43':
remove unneeded import statements.
Nick Kralevich [Tue, 22 Apr 2014 21:20:57 +0000 (21:20 +0000)]
am
d236d625: am
3ab7882a: am
a67d4a6e: Merge "remove unused import."
* commit '
d236d625b4a4e938629fbcc55687ca7bebaab6e8':
remove unused import.
Nick Kralevich [Tue, 22 Apr 2014 21:15:10 +0000 (21:15 +0000)]
am
5246f459: am
d267c1a0: Merge "remove unneeded import statements."
* commit '
5246f4599a0c9978012ffb1049307704b5027a0b':
remove unneeded import statements.
Nick Kralevich [Tue, 22 Apr 2014 21:14:59 +0000 (21:14 +0000)]
am
3ab7882a: am
a67d4a6e: Merge "remove unused import."
* commit '
3ab7882a57d3c7a0e13f58837cd02138df43f301':
remove unused import.
Ruchi Kandoi [Fri, 18 Apr 2014 01:01:40 +0000 (18:01 -0700)]
Adds Content Observer for the Low power mode in developer options.
Change-Id: Ibed319e734340dfd5348dbeb8fe20c01b1adaac5
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Nick Kralevich [Tue, 22 Apr 2014 19:52:21 +0000 (19:52 +0000)]
am
d267c1a0: Merge "remove unneeded import statements."
* commit '
d267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
remove unneeded import statements.
Nick Kralevich [Tue, 22 Apr 2014 19:52:18 +0000 (19:52 +0000)]
am
a67d4a6e: Merge "remove unused import."
* commit '
a67d4a6e4da1eb02a15a1048a26329cfed312938':
remove unused import.
Nick Kralevich [Tue, 22 Apr 2014 19:24:47 +0000 (19:24 +0000)]
Merge "remove unneeded import statements."
Nick Kralevich [Tue, 22 Apr 2014 19:23:30 +0000 (19:23 +0000)]
Merge "remove unused import."
Nick Kralevich [Tue, 22 Apr 2014 19:17:51 +0000 (12:17 -0700)]
remove unneeded import statements.
Internal master is out of sync with AOSP. Resync.
Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
Nick Kralevich [Tue, 22 Apr 2014 19:10:24 +0000 (12:10 -0700)]
remove unused import.
This change resynchronizes AOSP with internal master.
The import line is unused.
Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
Dan Sandler [Tue, 22 Apr 2014 18:51:43 +0000 (18:51 +0000)]
Merge "Avoid sending broadcasts before BOOT_COMPLETED."
Lajos Molnar [Tue, 22 Apr 2014 18:37:50 +0000 (18:37 +0000)]
Merge "Remove VideoEditor"
Justin Koh [Tue, 22 Apr 2014 18:30:09 +0000 (18:30 +0000)]
Merge "resolved conflicts for merge of
d90712d0 to master"
Justin Koh [Tue, 22 Apr 2014 18:02:32 +0000 (11:02 -0700)]
resolved conflicts for merge of
d90712d0 to master
Change-Id: Ia587476c001bce5f0969557b15d366aed6b322b1
Jean-Michel Trivi [Tue, 15 Apr 2014 00:40:22 +0000 (17:40 -0700)]
PlayerRecord: remove obsolete accessors
Change-Id: I0a7789e28c1427b6e9f770368f9bab9c097b3594
Jean-Michel Trivi [Tue, 22 Apr 2014 17:36:10 +0000 (17:36 +0000)]
Merge "MediaFocusControl: priority to playing players for media button"
Chris Craik [Tue, 22 Apr 2014 17:29:22 +0000 (17:29 +0000)]
Merge "Fix is_zero check"