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

126124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
d0abcedece Merge "Introduce the SearchIndexablesProvider and its friends" 2014-03-20 01:12:06 +00:00
Colin Cross
31d16e5bf9 bootanimation: build 32-bit if 64-bit gl libraries are not available 
Set LOCAL_32_BIT_ONLY if TARGET_32_BIT_SURFACEFLINGER is set.

Change-Id: I76396cc9fe3fe45d1e98a44bf911d6e70922555a
 2014-03-19 18:10:31 -07:00
Chris Craik
7c9bd98a4b am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev 
* commit '89513ee544cd6373496179758e09954af0ba217d':
  Fix projection offset caching - DO NOT MERGE
 2014-03-20 01:08:45 +00:00
Jim Miller
375ff2c4a7 am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 
* commit '2598fbd71a2109ab307d32935a13fa1eab150e8d':
  Attempt to fix a bug where SIM progress dialog gets stuck.
 2014-03-20 01:08:43 +00:00
Chris Craik
89513ee544 Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev 2014-03-20 01:04:57 +00:00
Jim Miller
2598fbd71a Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 2014-03-20 01:04:13 +00:00
Colin Cross
2764fce3a1 build app_process64 on 64-bit targets 
On 64-bit platforms builds two copies of app_process, the 32-bit
app_process and 64-bit app_process64.

Change-Id: I59d739b5df398ad0bd040c954c57640ff7ab3e72
 2014-03-19 17:49:47 -07:00
Dianne Hackborn
024a003d4c Merge "batstats: fix wake lock tracking, service bug" 2014-03-20 00:43:37 +00:00
Colin Cross
5c3f7236e6 Merge "MediaHTTPConnection: use jlong to store native pointer" 2014-03-20 00:35:32 +00:00
Wei Wang
4b4eebb9a5 DO NOT MERGE: Add status callback for start/stop advertising. 
Cherrypick from master to fix b/13289050

Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java
 2014-03-20 00:33:41 +00:00
Colin Cross
5e8ff02ec9 MediaHTTPConnection: use jlong to store native pointer 
Change-Id: Ic4f391a8e658498e63c26ea2af4c7413ed387360
 2014-03-19 17:28:42 -07:00
Igor Murashkin
7d9a8ffd08 camera: Fix setParameters for Preview FPS single/range values 
Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
 2014-03-20 00:21:44 +00:00
Dianne Hackborn
40c8725804 batstats: fix wake lock tracking, service bug 
- Fix bug I introduced in handling wake lock changes where
  we weren't iterating over the new work sources correctly.
- Fix bug in ActiveServices that would wtf too much.
- Prepare to start tracking uptime in the battery history.

Change-Id: Ia94316be51bc6eab7b02f214a5c40c08e99cc3b1
 2014-03-19 17:13:43 -07:00
Wei Wang
b4b66d2f3a Merge "Move advetise clean up to callback code. fixes b/13289050" 2014-03-20 00:12:23 +00:00
Wei Wang
809476525f Move advetise clean up to callback code. fixes b/13289050 
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
 2014-03-20 00:04:27 +00:00
John Reck
c5dc251e22 Merge "Move RenderNode to own file" 2014-03-19 23:47:14 +00:00
John Reck
113e0824d6 Move RenderNode to own file 
Change-Id: I9380d161fd3ddd7b569c262dd8e7aa0c96151b1e
 2014-03-19 16:40:04 -07:00
John Spurlock
87c28e27c5 Merge "Fix javadoc @links in Vibrator." 2014-03-19 23:30:51 +00:00
John Spurlock
a1bfe65daa Fix javadoc @links in Vibrator. 
Change-Id: I5143334735a1bcdf8252687e703c74656ff9d126
 2014-03-19 19:29:34 -04:00
Fabrice Di Meglio
b49995d4d9 Introduce the SearchIndexablesProvider and its friends 
- enable retrieval of search data to be indexed

Change-Id: I4a16408dec3d3305bf20107fb11eb2d1aee7fad5
 2014-03-19 15:44:01 -07:00
John Spurlock
2fcce9612d Fix broken tests to fix build 
Change-Id: I6bb9d178a9f1b09c1b247ec9cbdd57507295c4bf
 2014-03-19 18:42:31 -04:00
Victoria Lease
ca58036dd8 am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'cfd46dc4847d5ef1ed14484717cf857ae5f67cae':
  malloc some advances
 2014-03-19 22:36:38 +00:00
Victoria Lease
cfd46dc484 am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '610d401cb580ee233c008acf8fc076047a0ffdb4':
  malloc some advances
 2014-03-19 22:32:12 +00:00
Victoria Lease
610d401cb5 am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10':
  malloc some advances
 2014-03-19 22:27:06 +00:00
Victoria Lease
e9c7fd2f2e am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '55371beb024ae402831898f8788e4293f52dd832':
  malloc some advances
 2014-03-19 15:21:09 -07:00
Victoria Lease
55371beb02 am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2':
  malloc some advances
 2014-03-19 15:14:07 -07:00
Victoria Lease
754bf6abc0 am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
  malloc some advances
 2014-03-19 15:08:32 -07:00
Vinit Deshapnde
45b97c2c99 DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns 
This helps in reducing overt scans when cell network is unavailable; and
in turn helps alleviate some regulatory concerns.

BUG: 11062898

Change-Id: I2d860f2d1acfdafba427504247a54b81482b0f5b
 2014-03-19 15:04:49 -07:00
Victoria Lease
c8868db2a0 am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '737d3e5da366124d164555009fa5ee4552143cc8':
  malloc some advances
 2014-03-19 15:03:28 -07:00
Craig Mautner
5b39f63c24 am 9957c322: am c60ac2b8: am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '9957c322db8864117d375e157bccaf6033b45646':
  Fix loop limits.
 2014-03-19 22:01:32 +00:00
John Spurlock
07cf4da1d0 Merge "Add stream-level suppression to vibrate/audio services." 2014-03-19 21:58:19 +00:00
Victoria Lease
737d3e5da3 am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
  malloc some advances
 2014-03-19 14:57:36 -07:00
Craig Mautner
9957c322db am c60ac2b8: am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit 'c60ac2b825459165b7e708fc2049d04d6f5c3fb2':
  Fix loop limits.
 2014-03-19 21:56:21 +00:00
Victoria Lease
6b96ecca90 am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '32753f4f1c0dfd810d68759cce3e51cf788084f8':
  malloc some advances
 2014-03-19 14:51:58 -07:00
Craig Mautner
c60ac2b825 am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '924927d322b2aeb13cbd654b10807b9151a0822c':
  Fix loop limits.
 2014-03-19 21:51:51 +00:00
Victoria Lease
32753f4f1c am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '3191212259b1629cf8174416adf01522b88501ad':
  malloc some advances
 2014-03-19 14:47:23 -07:00
Chris Craik
8ee13de681 Merge "Update unsupported op tables for API 19, and for extensibility" 2014-03-19 21:46:17 +00:00
Craig Mautner
924927d322 am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '1888333d7e814d6681a327cf1f3eda10098e3620':
  Fix loop limits.
 2014-03-19 21:46:00 +00:00
Craig Mautner
1888333d7e am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit 'd4375b4713658c06001e9dba7105804c872fc199':
  Fix loop limits.
 2014-03-19 21:41:43 +00:00
Victoria Lease
3191212259 am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
  malloc some advances
 2014-03-19 14:40:17 -07:00
Craig Mautner
d4375b4713 Merge "Fix loop limits." into klp-dev 2014-03-19 21:37:07 +00:00
Victoria Lease
6eb2810318 am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances
 2014-03-19 14:32:15 -07:00
Etan Cohen
4a6f087950 Merge "Catch Netd exceptions to avoid runtime restart" 2014-03-19 21:30:15 +00:00
Wei Wang
ffbea5c7da Merge "Add status callback for start/stop advertising. Fixes b/13289050, b/13418851, also fixes 13418671." 2014-03-19 21:29:59 +00:00
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances 
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
 2014-03-19 14:27:19 -07:00
Robert Greenwalt
d9cb2f3d06 Catch Netd exceptions to avoid runtime restart 
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
 2014-03-19 14:26:28 -07:00
Glenn Kasten
29427a224e am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a0e300efae92d8155151e345034620054cff8955':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:22:09 +00:00
Glenn Kasten
5341f881e0 am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit '4f346bf0ffe1c596ca261dfec23c50977de77d82':
  Fix 64 bit compile failures in renderscript
 2014-03-19 21:22:06 +00:00
Glenn Kasten
a0e300efae am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit '458edc8de368607a1cf831f7e8bb70047c8bf905':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:15:41 +00:00
Glenn Kasten
4f346bf0ff am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit 'ff1e1d99ea029197051b3cdaa39effc6baa94b53':
  Fix 64 bit compile failures in renderscript
 2014-03-19 21:15:38 +00:00