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

122117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
quddusc
64231d01de Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs 2014-01-14 20:29:14 +00:00
John Spurlock
d29c609317 Merge "Allow lights-out + bar icon dimming on low-end devices." 2014-01-14 20:29:01 +00:00
quddusc
72159ab085 Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 2014-01-14 20:28:56 +00:00
John Spurlock
4f111f988d Merge "Revert "Support lights-out + bar icon dimming on low-end devices."" 2014-01-14 20:28:36 +00:00
John Spurlock
3dfb10506b Revert "Support lights-out + bar icon dimming on low-end devices." 
This reverts commit 8351f348cb6ebdc2a48ad41a21db024bf96c91fa.

Change-Id: I0b24fa7d978a69581e294c53bddc50053fb574b7
 2014-01-14 20:28:05 +00:00
John Spurlock
88926a5482 am 4b67b88e: am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit '4b67b88e344a147317fc6b32e5364d4cfabf1e1d':
  Docfixes: three typos and escape */*.
 2014-01-14 20:04:25 +00:00
John Spurlock
4b67b88e34 am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'cce06eda6bd6af957b261f66eb8ea3623fe09caf':
  Docfixes: three typos and escape */*.
 2014-01-14 20:00:42 +00:00
John Spurlock
cce06eda6b am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'b34363590953e4efd70168cdf03386d1e469a548':
  Docfixes: three typos and escape */*.
 2014-01-14 19:57:02 +00:00
John Spurlock
b343635909 am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit 'e05190eae74be57dd517bb5afbccf901543329bf':
  Docfixes: three typos and escape */*.
 2014-01-14 11:54:25 -08:00
John Spurlock
fd0e6c0d6f Allow lights-out + bar icon dimming on low-end devices. 
Maintain fallback to OPAQUE mode on low-end devices in place of the
translucent modes.

Bug: 12546110
Change-Id: Ia3582c305cb09aadd56c6aa58b039a174675c79a
 2014-01-14 14:51:23 -05:00
John Spurlock
e05190eae7 am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs 
* commit '85f98508366e8422f71553d2a5e682eb804c7419':
  Docfixes: three typos and escape */*.
 2014-01-14 19:50:38 +00:00
John Spurlock
85f9850836 Merge "Docfixes: three typos and escape */*." into klp-docs 2014-01-14 19:48:13 +00:00
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
2ab14daeba Centering the crop by default in system wallpaper cropper 
Bug: 12034934

Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
 2014-01-14 15:11:37 +01: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
Wei Wang
86b3fa6090 BLE peripheral mode (3/4): Add peripheral mode API. 
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
 2014-01-13 17:53:48 -08: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
Zhihai Xu
82e95573c7 NPE in BluetoothSocket.write() 
If calling connect succeed, we should not see this NPE.
An IOException may happen after call BluetoothSocket.connect.
If you still call write after the IOException,
you will get this NPE.
add NPE protection for possible wrong calling sequence from application,
To make bluetoothSocket more error-tolerant.

bug:12104154
Change-Id: I7fa4e847b500ca9b9d2a43df432f31a1bb016c0a
 2014-01-13 17:52:13 -08:00