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

120934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Wang
c0384b6b18 DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 
Cherrypick from master to fix b/13289050

Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
 2014-03-19 20:31:36 -07:00
Wei Wang
da084104eb Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 2014-03-20 03:27:47 +00:00
Jim Miller
bd33dc01f6 am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
* commit '8e69abf8c62452e6e9bcd254a55a2d80c8ef5b3d':
  DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
 2014-03-20 02:47:09 +00:00
Jim Miller
e0683de51e am 37050124: am a413a4ae: Fix the build. DO NOT MERGE 
* commit '370501243685a39a52b6e389b97711b906d2d4f8':
  Fix the build.  DO NOT MERGE
 2014-03-20 02:47:04 +00:00
Chris Craik
99689a6874 am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit '9208bb4a2b40e8269f601fa096ae9c88d6d1ce7a':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-20 02:35:47 +00:00
Chris Craik
9208bb4a2b am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit '00efaea980c7a9f84f326b22aef740cb5438d282':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-20 02:30:15 +00:00
Jim Miller
8e69abf8c6 am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
* commit '46e631178e3420fee182e7d9d1ddfdbca9355bc1':
  DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
 2014-03-20 02:30:14 +00:00
Chris Craik
00efaea980 am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit 'dac298005ce3c1361e27bb740e4b518765d43d77':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-19 19:24:53 -07:00
Jim Miller
46e631178e DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().

It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.

The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.

Fixes bug 11982048

Change-Id: I6959816b819ba953512c53675162195cbf1e0653
 2014-03-20 02:22:38 +00:00
Chris Craik
dac298005c Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 2014-03-20 02:19:54 +00:00
Nick Kralevich
857fe511fe am 0b4f63c3: am dd6b7495: am 83725810: Merge "Get rid of noise during boot." 
* commit '0b4f63c319f211ddd0d572b6b1eb647d0a6dc8a7':
  Get rid of noise during boot.
 2014-03-20 01:58:42 +00:00
Michael Wright
69e58e446b Merge "Add idc config option for handling key repeats" into klp-modular-dev 2014-03-20 01:55:16 +00:00
Nick Kralevich
0b4f63c319 am dd6b7495: am 83725810: Merge "Get rid of noise during boot." 
* commit 'dd6b7495577eca7a00aa37bfdca3449cf1443681':
  Get rid of noise during boot.
 2014-03-20 01:52:42 +00:00
Colin Cross
a78b389e54 am 49fca697: am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets" 
* commit '49fca697470b8321a02bdd2a828e9beec1ef1182':
  build app_process64 on 64-bit targets
 2014-03-20 01:49:57 +00:00
Jim Miller
3705012436 am a413a4ae: Fix the build. DO NOT MERGE 
* commit 'a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
  Fix the build.  DO NOT MERGE
 2014-03-20 01:49:31 +00:00
Nick Kralevich
dd6b749557 am 83725810: Merge "Get rid of noise during boot." 
* commit '8372581089422364f4f8bc948b9cbdcf5f8c2e91':
  Get rid of noise during boot.
 2014-03-19 18:47:45 -07:00
Jim Miller
a413a4ae32 Fix the build. DO NOT MERGE 
Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
 2014-03-19 18:38:09 -07:00
Nick Kralevich
8372581089 Merge "Get rid of noise during boot." 2014-03-20 01:37:39 +00:00
Dianne Hackborn
0aa5163c13 Get rid of noise during boot. 
This log is not an error, it is a warning, don't spam a stack
crawl when it happens.

Change-Id: I6038e3625cc0c16af9e54887b5e7ec451d9f864d
 2014-03-19 18:34:52 -07:00
Colin Cross
49fca69747 am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets" 
* commit '0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1':
  build app_process64 on 64-bit targets
 2014-03-20 01:23:28 +00:00
Colin Cross
0dccb02b9f am 19fc55e1: Merge "build app_process64 on 64-bit targets" 
* commit '19fc55e1e3a51aba4db985d186d1f4ec075d7ca1':
  build app_process64 on 64-bit targets
 2014-03-19 18:19:25 -07:00
Chris Craik
29f00c9f35 am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev 
* commit '7c9bd98a4bb0aa6954d5f612c197d03f309980f0':
  Fix projection offset caching - DO NOT MERGE
 2014-03-20 01:14:44 +00:00
Colin Cross
19fc55e1e3 Merge "build app_process64 on 64-bit targets" 2014-03-20 01:14:43 +00:00
Jim Miller
abde0aaa79 am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 
* commit '375ff2c4a7b42d6dfd333e0ffa351be88fdab034':
  Attempt to fix a bug where SIM progress dialog gets stuck.
 2014-03-20 01:14:40 +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
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
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
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
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
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances 
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
 2014-03-19 14:27:19 -07:00