OSDN Git Service
Narayan Kamath [Tue, 14 Jan 2014 10:26:18 +0000 (10:26 +0000)]
am
ec70f809: am
d34950cf: am
80b0496a: am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
ec70f8091185cd68afd4fcda42b513111eae70e4':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:23:44 +0000 (10:23 +0000)]
am
d34950cf: am
80b0496a: am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
d34950cfc66e258caba14c7ddc553028647898f1':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:20:33 +0000 (10:20 +0000)]
am
80b0496a: am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
80b0496abeb03fe4c5086430218c7e4bcf3773db':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:16:39 +0000 (02:16 -0800)]
am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
2db26788ab367f08cb5378d77e22e8939e7a28c2':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:13:45 +0000 (02:13 -0800)]
am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
e71afc2ea72e98c4631e79cad65f678090da87d3':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:09:50 +0000 (10:09 +0000)]
Merge "Revert "Hide AssetInputStream.getAssetInt.""
Narayan Kamath [Tue, 14 Jan 2014 10:08:45 +0000 (10:08 +0000)]
Revert "Hide AssetInputStream.getAssetInt."
This reverts commit
842d44ec1765e01f4a37af99cc1935b4d0399758.
Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
Narayan Kamath [Tue, 14 Jan 2014 10:00:06 +0000 (10:00 +0000)]
am
cce8e8a5: am
7f4dd912: am
271b28ac: am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
cce8e8a5c765c13c3578bf1b9c2106c5daa104ff':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:57:37 +0000 (09:57 +0000)]
am
7f4dd912: am
271b28ac: am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
7f4dd91299051d89e04979ba26ee5c27472f49d4':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:54:33 +0000 (09:54 +0000)]
am
271b28ac: am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
271b28ac3121e8bcc46e15bd15b13bfbc1e1be89':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:51:14 +0000 (01:51 -0800)]
am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
8021316010fb4bd18a29751949eb2cda66199b6e':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:48:37 +0000 (01:48 -0800)]
am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:45:40 +0000 (09:45 +0000)]
Merge "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Fri, 10 Jan 2014 17:32:28 +0000 (17:32 +0000)]
Hide AssetInputStream.getAssetInt.
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.
(cherry picked from commit
f8f09a15a409f373f22aa475bb0defd264088e4f)
Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
Narayan Kamath [Fri, 10 Jan 2014 17:32:28 +0000 (17:32 +0000)]
Hide AssetInputStream.getAssetInt.
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.
Change-Id: If02d42a528b9d90f11cb25c3342404b7d5f7b625
Zhihai Xu [Tue, 14 Jan 2014 06:47:05 +0000 (06:47 +0000)]
Merge "NPE in BluetoothDevice.fetchUuidsWithSdp"
Dianne Hackborn [Tue, 14 Jan 2014 05:46:36 +0000 (05:46 +0000)]
am
6873e17d: am
305c61a1: am
3a8a8ddd: am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
6873e17d4b565aa1d4ea2a8f1ac261f517dcc2ff':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Tue, 14 Jan 2014 01:53:07 +0000 (01:53 +0000)]
am
305c61a1: am
3a8a8ddd: am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
305c61a1c6816549b225719518df5b29a17f0f42':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Tue, 14 Jan 2014 01:47:15 +0000 (01:47 +0000)]
am
3a8a8ddd: am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
3a8a8ddd7cff03e39d4cb104ddb1d0401b6c7ede':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Tue, 14 Jan 2014 01:45:16 +0000 (17:45 -0800)]
am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
8c359bf473b4c31407613dbc1473ba49b0297898':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Tue, 14 Jan 2014 01:42:01 +0000 (17:42 -0800)]
am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
c174288d345d4a80b326b12ff4c10a6c99570997':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Dianne Hackborn [Mon, 9 Dec 2013 19:26:11 +0000 (11:26 -0800)]
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Got a little too aggressive about cleaning up service state; need to
avoid removing services from an app until we are in the second loop
doing the final cleanup, otherwise we can leave services around with
restarting their process.
Also fix crash:
W/BinderNative( 667): Uncaught exception from death notification
W/BinderNative( 667): java.lang.ArrayIndexOutOfBoundsException: length=0; index=0
W/BinderNative( 667): at android.util.ArraySet.valueAt(ArraySet.java:301)
W/BinderNative( 667): at com.android.server.am.ActiveServices.killServicesLocked(ActiveServices.java:2069)
W/BinderNative( 667): at com.android.server.am.ActivityManagerService.cleanUpApplicationRecordLocked(ActivityManagerService.java:12412)
W/BinderNative( 667): at com.android.server.am.ActivityManagerService.handleAppDiedLocked(ActivityManagerService.java:3596)
W/BinderNative( 667): at com.android.server.am.ActivityManagerService.appDiedLocked(ActivityManagerService.java:3744)
W/BinderNative( 667): at com.android.server.am.ActivityManagerService$AppDeathRecipient.binderDied(ActivityManagerService.java:1024)
W/BinderNative( 667): at android.os.BinderProxy.sendDeathNotice(Binder.java:493)
W/BinderNative( 667): at dalvik.system.NativeStart.run(Native Method)
Zhihai Xu [Tue, 14 Jan 2014 00:54:38 +0000 (16:54 -0800)]
NPE in BluetoothDevice.fetchUuidsWithSdp
This is caused by access fetchUuidsWithSdp after bluetooth is turned off.
We can add check null pointer for sService,
before call sService.fetchRemoteUuids(this) to fix this problem;
bug:
12533948
Change-Id: Id2cab92a56185073fabcabcfb21a243e99a60cee
Tim Murray [Tue, 14 Jan 2014 00:43:09 +0000 (00:43 +0000)]
Merge "Add clipping for intrinsics."
Ricardo Cervera [Tue, 14 Jan 2014 00:33:36 +0000 (00:33 +0000)]
am
595ddb89: am
03d65b4b: am
9865216e: am
18bf3b1d: am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
595ddb89118a33743a05d20bc6c70f8b7a10406d':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:33:32 +0000 (00:33 +0000)]
Ricardo Cervera [Tue, 14 Jan 2014 00:30:18 +0000 (00:30 +0000)]
am
03d65b4b: am
9865216e: am
18bf3b1d: am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
03d65b4b8a0893d57c5bb00f7f8d02a7869ff12c':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:30:11 +0000 (00:30 +0000)]
Ricardo Cervera [Tue, 14 Jan 2014 00:26:41 +0000 (00:26 +0000)]
am
9865216e: am
18bf3b1d: am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
9865216eb1c747b03cb60245772b196fc039a1b6':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:26:36 +0000 (00:26 +0000)]
am
f4494e6c: am
faca5e3c: am
ac5ad7b9: docs: Fixed typos.
* commit '
f4494e6c8f7fc610795337a72d774e0f6cdc94ac':
docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:23:24 +0000 (16:23 -0800)]
am
18bf3b1d: am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
18bf3b1df67f219d70e6cba828216a47d92e3dc5':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:23:19 +0000 (16:23 -0800)]
am
faca5e3c: am
ac5ad7b9: docs: Fixed typos.
* commit '
faca5e3c917a6197b380eb5d2b51893b5d689946':
docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:19:55 +0000 (00:19 +0000)]
am
5e15e1ab: Merge "docs: Fixed typo." into klp-docs
* commit '
5e15e1abe8a14f95ab40cf8181ac2a4f8b5d76e2':
docs: Fixed typo.
Ricardo Cervera [Tue, 14 Jan 2014 00:19:51 +0000 (00:19 +0000)]
am
ac5ad7b9: docs: Fixed typos.
* commit '
ac5ad7b9e488a967ffee56fd1b168c010c1d62e8':
docs: Fixed typos.
Ricardo Cervera [Tue, 14 Jan 2014 00:18:23 +0000 (00:18 +0000)]
Merge "docs: Fixed typo." into klp-docs
Craig Mautner [Tue, 14 Jan 2014 00:05:41 +0000 (00:05 +0000)]
am
5c44c51c: Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev
* commit '
5c44c51c2a0b5a2268de07fab6854623188b5a7c':
Use new DisplayManager flag to show own content only.
Ricardo Cervera [Mon, 13 Jan 2014 21:48:45 +0000 (13:48 -0800)]
docs: Fixed typos.
bug:
10732654
Change-Id: I5a580cf40e2670485f9c57e2376efd20bcf7b60d
Review URL: http://quixote.mtv.corp.google.com:8002/training/articles/security-tips.html
Craig Mautner [Tue, 14 Jan 2014 00:00:00 +0000 (00:00 +0000)]
Merge "Use new DisplayManager flag to show own content only." into klp-modular-dev
Eino-Ville Talvala [Mon, 13 Jan 2014 23:53:53 +0000 (23:53 +0000)]
Merge "Camera2: Docs: Update cross-refs, aeMode, aeAntibandingMode"
Ricardo Cervera [Mon, 13 Jan 2014 21:27:47 +0000 (13:27 -0800)]
docs: Fixed typo.
bug:
10797855
Change-Id: I2fdfa02046827a51eb7263e1892a04acfd4f0453
Review fix URL:
http://quixote.mtv.corp.google.com:8001/distribute/index.html
Eino-Ville Talvala [Thu, 9 Jan 2014 00:18:35 +0000 (16:18 -0800)]
Camera2: Docs: Update cross-refs, aeMode, aeAntibandingMode
Unhide android.control.aeMode and android.control.availableAeModes,
which were supposed to be public all along.
This matches up to system/media commit #
9fa0d90ff
Change-Id: Ibba2756dd5889344b5d0531dc6f066566776cdc1
Svetoslav [Mon, 13 Jan 2014 23:31:32 +0000 (23:31 +0000)]
Merge "ProgressBar is important for accessibility by default."
Svetoslav [Mon, 13 Jan 2014 23:25:58 +0000 (15:25 -0800)]
ProgressBar is important for accessibility by default.
If a view does not have callbacks, or content description, or does not draw
content, and it is marked as important for accessibility auto, then the system
decides it is not important and does not report it. Apparently progress bar
draws content that means something and it should be important for accessibility
by default.
Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
Alan Viverette [Mon, 13 Jan 2014 23:02:31 +0000 (23:02 +0000)]
Merge "Move drag-to-open handling into ActionMenuItemView"
Alan Viverette [Fri, 10 Jan 2014 22:03:21 +0000 (14:03 -0800)]
Move drag-to-open handling into ActionMenuItemView
This prevents the menu item's OnClickListener from being overwritten,
allows the client to override item invocation, and prevents showing
multiple popups when items are re-initialized.
BUG:
11969895
BUG:
12489213
Change-Id: I97ca737810073df348171cdba5442f24a5527f89
Jim Miller [Mon, 13 Jan 2014 22:28:03 +0000 (22:28 +0000)]
am
cd655f12: Merge "Fix broken homekey on devices without keyguard" into klp-modular-dev
* commit '
cd655f12e730a76e2a97ce6af775b852adc493ce':
Fix broken homekey on devices without keyguard
Jim Miller [Mon, 13 Jan 2014 22:25:03 +0000 (22:25 +0000)]
Merge "Fix broken homekey on devices without keyguard" into klp-modular-dev
John Spurlock [Mon, 13 Jan 2014 21:41:07 +0000 (21:41 +0000)]
Merge "Remove only com.google reference from SystemUI."
David Christie [Mon, 13 Jan 2014 21:13:54 +0000 (21:13 +0000)]
am
e769a040: am
cf77c059: am
c809bd8b: am
d8dfa528: am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
e769a0406997e2ec33b0b979f3ccec85c18bb3ef':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 21:10:05 +0000 (21:10 +0000)]
am
cf77c059: am
c809bd8b: am
d8dfa528: am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
cf77c05988dee8410d9235b9818dbcdf01c48f4f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 21:06:24 +0000 (21:06 +0000)]
am
c809bd8b: am
d8dfa528: am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
c809bd8b39c2ab8874d6eb2e7189ca9e72f4c9ed':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 21:03:33 +0000 (13:03 -0800)]
am
d8dfa528: am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
d8dfa528b86e734318159b6fa75814184fb02c9d':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Alan Viverette [Mon, 13 Jan 2014 21:01:48 +0000 (21:01 +0000)]
Merge "Pushing in boilerplate Quantum and Quantum.Light styles"
Alan Viverette [Mon, 13 Jan 2014 21:00:45 +0000 (21:00 +0000)]
Merge "Fixing LayerDrawable methods for find layer and invalidate"
Alan Viverette [Mon, 13 Jan 2014 20:59:50 +0000 (12:59 -0800)]
Fixing LayerDrawable methods for find layer and invalidate
BUG:
12475487
BUG:
12475575
Change-Id: I98eb2674a5090a20cae1cd69db6022859dcab36c
David Christie [Mon, 13 Jan 2014 20:59:20 +0000 (12:59 -0800)]
am
301b1fac: am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
301b1facb23d148efebd7a2aa5c174cd7c04cc6f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:56:27 +0000 (12:56 -0800)]
am
26c6c15f: am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
26c6c15f54231c154bb2f7febb053d034cbe40c5':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Craig Mautner [Mon, 13 Jan 2014 20:55:33 +0000 (12:55 -0800)]
Use new DisplayManager flag to show own content only.
Change-Id: I8b2666e5849e57b5eb2ed73ed3d5e39da2dbd55d
David Christie [Mon, 13 Jan 2014 20:53:27 +0000 (12:53 -0800)]
am
b3c96c4c: am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
b3c96c4c57cb97924f828ea917b1c4d63b2c9d00':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:50:18 +0000 (12:50 -0800)]
am
1d151607: am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:46:35 +0000 (12:46 -0800)]
am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
4013c4b18ccc66b510f4cdb222d4c04597975843':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:43:47 +0000 (12:43 -0800)]
am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:41:48 +0000 (12:41 -0800)]
am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a7d13fabd6184e411215e9a841cf16097f1a5127':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:40:04 +0000 (12:40 -0800)]
am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
45aaa377c5d090003c6cf5fb54fff856a0807c4f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Geoff Mendal [Mon, 13 Jan 2014 20:37:13 +0000 (20:37 +0000)]
Merge "Import translations. DO NOT MERGE"
David Christie [Mon, 13 Jan 2014 20:36:49 +0000 (12:36 -0800)]
am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a1b89310d58df14570f7f6f5abb677c976c63a7a':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Geoff Mendal [Mon, 13 Jan 2014 20:33:52 +0000 (20:33 +0000)]
Merge "Import translations. DO NOT MERGE"
David Christie [Mon, 13 Jan 2014 20:33:39 +0000 (12:33 -0800)]
am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Geoff Mendal [Mon, 13 Jan 2014 19:59:12 +0000 (11:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib8169e516ef1d0b7911adabbd945673b199eddd2
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Jan 2014 19:51:13 +0000 (11:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I74b8724bc83b4f86569a2b10e2fee3b44af65410
Auto-generated-cl: translation import
Tim Murray [Mon, 13 Jan 2014 19:47:53 +0000 (11:47 -0800)]
Add clipping for intrinsics.
Change-Id: Ic7e1da3c69aa3d5f990816178739120b6059e7a5
Glenn Kasten [Mon, 13 Jan 2014 19:25:58 +0000 (19:25 +0000)]
Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM"
Daniel Cashman [Mon, 13 Jan 2014 19:12:48 +0000 (19:12 +0000)]
am
71007e5d: am
555b8ebf: am
e29ff50a: am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
71007e5d549ba72f68d9ee054cffb477205d3ac5':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:10:08 +0000 (19:10 +0000)]
am
555b8ebf: am
e29ff50a: am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
555b8ebfd6e4ee1f60752459061f6dae2fd45981':
Clear cached locations when location providers disabled Bug:
12118307
John Spurlock [Mon, 13 Jan 2014 19:06:43 +0000 (19:06 +0000)]
Merge "Use accessors for @hidden fields."
Daniel Cashman [Mon, 13 Jan 2014 19:05:49 +0000 (19:05 +0000)]
am
e29ff50a: am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
e29ff50aae302ef05b0592e4bab6b3090a59254a':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:04:18 +0000 (19:04 +0000)]
am
94827c34: am
21a801d0: am
0d30e07d: am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
94827c3484da6f0a9cd171e6892d2710b1eafa12':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:02:15 +0000 (11:02 -0800)]
am
fe7bfdd3: am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
fe7bfdd384f199668ba9b1b751194e06cbb50b3b':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:00:37 +0000 (19:00 +0000)]
am
21a801d0: am
0d30e07d: am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
21a801d0885d65f128b84a593140b07fd0d4e980':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 19:00:02 +0000 (11:00 -0800)]
am
af2f2f76: am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
af2f2f767a1673f10a2b44f913832cacefda341b':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:57:19 +0000 (18:57 +0000)]
am
0d30e07d: am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
0d30e07d23e9a2bcea4c1b3e61e12e68f5111fe2':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:56:41 +0000 (10:56 -0800)]
am
9ecadd7c: am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
9ecadd7cedc492faef163a314713caddbd5da39a':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:53:31 +0000 (10:53 -0800)]
am
6f34b938: am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:52:54 +0000 (10:52 -0800)]
am
3d5ea26f: am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
3d5ea26fbb92b1b780cd9763c0731288f48341a3':
Clear cached locations when location providers disabled Bug:
12118307
Jeff Sharkey [Mon, 13 Jan 2014 18:51:24 +0000 (18:51 +0000)]
am
38c65b1f: am
6fba240b: am
6d3700b3: am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
38c65b1f70042bc8e37e91106692158f0ce98703':
MountService listeners can not be unregistered
Daniel Cashman [Mon, 13 Jan 2014 18:50:03 +0000 (10:50 -0800)]
am
3238d0d9: Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
* commit '
3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:49:40 +0000 (10:49 -0800)]
am
4503409a: Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
* commit '
4503409a477f3fca2eb60e4105d804069d7b0cad':
Clear cached locations when location providers disabled Bug:
12118307
Jeff Sharkey [Mon, 13 Jan 2014 18:47:41 +0000 (18:47 +0000)]
am
6fba240b: am
6d3700b3: am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
6fba240b72e9ae2bc66c98b058e78aecd568ae3f':
MountService listeners can not be unregistered
Daniel Cashman [Mon, 13 Jan 2014 18:44:45 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
Jeff Sharkey [Mon, 13 Jan 2014 18:44:43 +0000 (18:44 +0000)]
am
6d3700b3: am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
6d3700b394c7137ef95580d35223a402a3dd0e7c':
MountService listeners can not be unregistered
Daniel Cashman [Mon, 13 Jan 2014 18:44:37 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug:
12118307" into klp-dev
Jeff Sharkey [Mon, 13 Jan 2014 18:42:07 +0000 (10:42 -0800)]
am
47235e8b: am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
47235e8b5ce6c622a1182933404cf5a17fcd35dc':
MountService listeners can not be unregistered
Jeff Sharkey [Mon, 13 Jan 2014 18:37:51 +0000 (10:37 -0800)]
am
90cadb35: Merge "MountService listeners can not be unregistered"
* commit '
90cadb35156829ff1d6b7066409596da38fc70e1':
MountService listeners can not be unregistered
Jeff Sharkey [Mon, 13 Jan 2014 18:35:31 +0000 (18:35 +0000)]
Merge "MountService listeners can not be unregistered"
ztenghui [Mon, 13 Jan 2014 18:28:42 +0000 (18:28 +0000)]
Merge "Calculate and show the shadow from a spot light."
Marco Nelissen [Mon, 13 Jan 2014 18:19:17 +0000 (10:19 -0800)]
libjhead_jni is still needed
protip: do not remove things from makefiles just because it builds without them
b/
12528751
Change-Id: I3ef8dcdf638e8b59d309922bb972c893fc75a712
John Spurlock [Mon, 13 Jan 2014 16:59:22 +0000 (11:59 -0500)]
Use accessors for @hidden fields.
Change-Id: I7d66070afb707262cc0dff93b9f9a1dbe77b0092
John Spurlock [Mon, 13 Jan 2014 16:27:25 +0000 (11:27 -0500)]
Remove only com.google reference from SystemUI.
Change-Id: Ie02bf3662307fa1ea3c68b908a7856fbf0482bb7
Narayan Kamath [Mon, 13 Jan 2014 13:10:53 +0000 (13:10 +0000)]
am
909427d0: am
f588d2df: am
d0ec6d8c: am
bc2a449a: am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
909427d093c30d2d4f4ffe5da19f1db6c3e9a3b3':
Fix preference puts with "null" values.
Narayan Kamath [Mon, 13 Jan 2014 13:07:47 +0000 (13:07 +0000)]
am
f588d2df: am
d0ec6d8c: am
bc2a449a: am
cb4d3ec1: Merge "Fix preference puts with "null" values."
* commit '
f588d2dff2ca6000fe02c5ac6e85f97133477767':
Fix preference puts with "null" values.