drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,044 Commits 1 Branch 0 Tags
Commit Graph

122044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
8d45cdf387 Merge "Support lights-out + bar icon dimming on low-end devices." 2014-01-14 18:37:03 +00:00
Ying Wang
b114402f82 Merge "Fix SDK build." 2014-01-14 18:11:00 +00:00
Ying Wang
640f10bc4f Fix SDK build. 
Change-Id: I57b400d5cb8e03abdfd234e79e4698347228bfa0
 2014-01-14 10:09:35 -08:00
John Spurlock
8351f348cb Support lights-out + bar icon dimming on low-end devices. 
Bug: 12546110
Change-Id: Ie2d2cc4acfee3f4a70542c5ebf9f2e9d69bffb33
 2014-01-14 18:07:55 +00:00
Ricardo Cervera
e7844c60db am ca2d8954: am 82ec0954: am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 
* commit 'ca2d89548fa32740cb2dcf7745f0bec2fab970c7':
  docs: Fixed typo in AlertDialog code snippet.
 2014-01-14 17:49:43 +00:00
Ricardo Cervera
ca2d89548f am 82ec0954: am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 
* commit '82ec09547423f7166e271226825ddd686cbab8cb':
  docs: Fixed typo in AlertDialog code snippet.
 2014-01-14 17:47:04 +00:00
Ricardo Cervera
82ec095474 am afe90d80: am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 
* commit 'afe90d80563bf6e236f7be6d6312f269a1919cb8':
  docs: Fixed typo in AlertDialog code snippet.
 2014-01-14 17:43:25 +00:00
Ricardo Cervera
afe90d8056 am 7dde7879: am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 
* commit '7dde7879a4561a3ec9ffc48921a4d074e40aa74e':
  docs: Fixed typo in AlertDialog code snippet.
 2014-01-14 09:39:29 -08:00
Ricardo Cervera
7dde7879a4 am 1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 
* commit '1a21c16b2bd74c022d6b83177027b78992dc42b5':
  docs: Fixed typo in AlertDialog code snippet.
 2014-01-14 17:36:07 +00:00
Ricardo Cervera
1a21c16b2b Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs 2014-01-14 17:34:21 +00:00
Marco Nelissen
633f8c227b am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" 
* commit '28f032e6a66d74d570b36672939000707455acb1':
  Add NULL check in updateProxyConfig
 2014-01-14 16:25:18 +00:00
Marco Nelissen
28f032e6a6 am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" 
* commit 'e2c046fe7c5eefb49f710bc417d54448c133cc93':
  Add NULL check in updateProxyConfig
 2014-01-14 16:21:43 +00:00
Marco Nelissen
e2c046fe7c am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" 
* commit '13249411b1c7dd4a476eec6905998217636a9344':
  Add NULL check in updateProxyConfig
 2014-01-14 16:18:02 +00:00
Marco Nelissen
13249411b1 am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" 
* commit 'a9045d24a73faa6aa1e8ad204a1e14a53711a824':
  Add NULL check in updateProxyConfig
 2014-01-14 08:15:13 -08:00
Marco Nelissen
a9045d24a7 am 337aa376: Merge "Add NULL check in updateProxyConfig" 
* commit '337aa376c09bb97a48afe075b4018f030445534f':
  Add NULL check in updateProxyConfig
 2014-01-14 08:11:39 -08:00
Marco Nelissen
337aa376c0 Merge "Add NULL check in updateProxyConfig" 2014-01-14 16:08:18 +00:00
Michael Jurka
35f922d1d0 Update system wallpaper cropper with latest changes from Launcher3 cropper 2014-01-14 14:10:32 +01:00
Narayan Kamath
3a248a1493 am ec70f809: am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit 'ec70f8091185cd68afd4fcda42b513111eae70e4':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 10:26:18 +00:00
Narayan Kamath
ec70f80911 am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit 'd34950cfc66e258caba14c7ddc553028647898f1':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 10:23:44 +00:00
Narayan Kamath
d34950cfc6 am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit '80b0496abeb03fe4c5086430218c7e4bcf3773db':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 10:20:33 +00:00
Narayan Kamath
80b0496abe am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit '2db26788ab367f08cb5378d77e22e8939e7a28c2':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 02:16:39 -08:00
Narayan Kamath
2db26788ab am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 
* commit 'e71afc2ea72e98c4631e79cad65f678090da87d3':
  Revert "Hide AssetInputStream.getAssetInt."
 2014-01-14 02:13:45 -08:00
Narayan Kamath
e71afc2ea7 Merge "Revert "Hide AssetInputStream.getAssetInt."" 2014-01-14 10:09:50 +00:00
Narayan Kamath
b1bd1fe7fd Revert "Hide AssetInputStream.getAssetInt." 
This reverts commit 842d44ec1765e01f4a37af99cc1935b4d0399758.

Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
 2014-01-14 10:08:45 +00:00
Narayan Kamath
bc448267ea am cce8e8a5: am 7f4dd912: am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit 'cce8e8a5c765c13c3578bf1b9c2106c5daa104ff':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 10:00:06 +00:00
Narayan Kamath
cce8e8a5c7 am 7f4dd912: am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit '7f4dd91299051d89e04979ba26ee5c27472f49d4':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 09:57:37 +00:00
Narayan Kamath
7f4dd91299 am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit '271b28ac3121e8bcc46e15bd15b13bfbc1e1be89':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 09:54:33 +00:00
Narayan Kamath
271b28ac31 am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit '8021316010fb4bd18a29751949eb2cda66199b6e':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 01:51:14 -08:00
Narayan Kamath
8021316010 am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt." 
* commit 'ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
  Hide AssetInputStream.getAssetInt.
 2014-01-14 01:48:37 -08:00
Narayan Kamath
ac8ccc3c18 Merge "Hide AssetInputStream.getAssetInt." 2014-01-14 09:45:41 +00:00
Narayan Kamath
842d44ec17 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
 2014-01-14 09:34:00 +00:00
Narayan Kamath
f8f09a15a4 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
 2014-01-14 09:31:29 +00:00
Zhihai Xu
9efa3b6c63 Merge "NPE in BluetoothDevice.fetchUuidsWithSdp" 2014-01-14 06:47:06 +00:00
Dianne Hackborn
1bca21ced0 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
 2014-01-14 05:46:36 +00:00
Dianne Hackborn
6873e17d4b 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
 2014-01-14 01:53:07 +00:00
Dianne Hackborn
305c61a1c6 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
 2014-01-14 01:47:15 +00:00
Dianne Hackborn
3a8a8ddd7c 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
 2014-01-13 17:45:16 -08:00
Dianne Hackborn
8c359bf473 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
 2014-01-13 17:42:01 -08:00
Dianne Hackborn
c174288d34 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)
 2014-01-13 17:10:03 -08:00
Zhihai Xu
5d04f1c9d9 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
 2014-01-13 16:54:38 -08:00
Ricardo Cervera
7a8acfa68e docs: Fixed typo in AlertDialog code snippet. 
Bug-ID:10797361

Review URL:
http://quixote.mtv.corp.google.com:8001/guide/topics/ui/dialogs.html#AlertDialog

Change-Id: If93e140d624c2a4360a27bfae630f19fce24d7ab
 2014-01-13 16:44:19 -08:00
Tim Murray
881c6d57d2 Merge "Add clipping for intrinsics." 2014-01-14 00:43:09 +00:00
Ricardo Cervera
3778e50d91 am 595ddb89: am 03d65b4b: am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs 
* commit '595ddb89118a33743a05d20bc6c70f8b7a10406d':
  docs: Fixed typo.
 2014-01-14 00:33:36 +00:00
Ricardo Cervera
9908e6fe5e am 15de74b6: am cfbc332f: am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos. 
* commit '15de74b64b08c5f6d17c1a4c1d225dca70064f71':
  docs: Fixed typos.
 2014-01-14 00:33:32 +00:00
Ricardo Cervera
595ddb8911 am 03d65b4b: am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs 
* commit '03d65b4b8a0893d57c5bb00f7f8d02a7869ff12c':
  docs: Fixed typo.
 2014-01-14 00:30:18 +00:00
Ricardo Cervera
15de74b64b am cfbc332f: am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos. 
* commit 'cfbc332f6f63de09a126b45fa78e093a92eef09e':
  docs: Fixed typos.
 2014-01-14 00:30:11 +00:00
Ricardo Cervera
03d65b4b8a am 9865216e: am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs 
* commit '9865216eb1c747b03cb60245772b196fc039a1b6':
  docs: Fixed typo.
 2014-01-14 00:26:41 +00:00
Ricardo Cervera
cfbc332f6f am f4494e6c: am faca5e3c: am ac5ad7b9: docs: Fixed typos. 
* commit 'f4494e6c8f7fc610795337a72d774e0f6cdc94ac':
  docs: Fixed typos.
 2014-01-14 00:26:36 +00:00
Ricardo Cervera
9865216eb1 am 18bf3b1d: am 5e15e1ab: Merge "docs: Fixed typo." into klp-docs 
* commit '18bf3b1df67f219d70e6cba828216a47d92e3dc5':
  docs: Fixed typo.
 2014-01-13 16:23:24 -08:00
Ricardo Cervera
f4494e6c8f am faca5e3c: am ac5ad7b9: docs: Fixed typos. 
* commit 'faca5e3c917a6197b380eb5d2b51893b5d689946':
  docs: Fixed typos.
 2014-01-13 16:23:19 -08:00