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

119675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Koch
1f839d9210 am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit '5a510a2c3e0ec5f2e60577c7a57e60c2101ee354':
  Point bitmaps training class to new samples directory.
 2014-03-20 16:38:15 +00:00
Scott Main
d79cc81fa8 am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad 
* commit 'e02d5a20ede8a6ac46e7b60cc0b258d42e224087':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
 2014-03-20 16:38:12 +00:00
Wei Wang
b0d63d5359 am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit '13bd85772f6279d14303ec3a18615613c3722844':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 16:38:04 +00:00
Wei Wang
9b12bd90a5 am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit '15a18d07acc57d465e9d67bb28010912bb9ad15f':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 16:37:53 +00:00
Jim Miller
c96693b517 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 16:37:48 +00:00
Jim Miller
bab95c0172 am 37050124: am a413a4ae: Fix the build. DO NOT MERGE 
* commit '370501243685a39a52b6e389b97711b906d2d4f8':
  Fix the build.  DO NOT MERGE
 2014-03-20 16:37:44 +00:00
Adam Powell
f503a2d47f Update contextual asset bar assets to avoid 9-patch artifacts 
Asset drop from UX

Bug 11879853

Change-Id: I8190340900a16ae41135ec1231e36e959603e165
 2014-03-20 09:32:11 -07:00
Chris Craik
d23d5b192a 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 15:42:24 +00:00
Jim Miller
dca18258e8 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 15:42:20 +00:00
Victoria Lease
3486659584 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-20 15:41:49 +00:00
Narayan Kamath
a2275b9869 am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." 
* commit 'c850102d5c4b1fad47c221911c7be5567cebe8b1':
  Don't register methods when there's nothing to register.
 2014-03-20 10:18:46 +00:00
Narayan Kamath
c850102d5c am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." 
* commit '0da4ad425d52d1aeec16b31b784c456753532dc2':
  Don't register methods when there's nothing to register.
 2014-03-20 03:13:27 -07:00
Narayan Kamath
0da4ad425d Merge "Don't register methods when there's nothing to register." 2014-03-20 10:08:38 +00:00
Adam Koch
5a510a2c3e am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit '6398a86f1b6ce84effc1417b8b99216e3093af48':
  Point bitmaps training class to new samples directory.
 2014-03-20 09:31:00 +00:00
Scott Main
e02d5a20ed am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad 
* commit 'a32c43761e5a101efbbb9183f4421ba40f4c75fb':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
 2014-03-20 09:30:51 +00:00
Adam Koch
6398a86f1b Merge "Point bitmaps training class to new samples directory." into klp-docs 2014-03-20 07:12:06 +00:00
Adam Koch
21e3372d39 Point bitmaps training class to new samples directory. 
Change-Id: I5c5ca9619fe47c79066db846cbbee1b26d71826e
 2014-03-20 14:56:41 +08:00
Scott Main
a32c43761e update to wear docs. 
includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414
and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad

Change-Id: I035b8db9b266e0af16fe30b3f30846608a3b69a5
 2014-03-19 21:20:37 -07:00
Wei Wang
13bd85772f am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit 'c0384b6b18617cc395814c5b20077955a185e392':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 03:41:47 +00:00
Wei Wang
15a18d07ac am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit 'da084104eb768f4472b7988b77a4f2b7e3f170d8':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 03:32:17 +00:00
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
Minoru Aoi
2b74a24a52 Set ScreenshotSurface secure if any secure content is shown. 
The screenrecord command can record secure content during rotation.
This is because the ScreenshotSurface surface for rotation animation
is not set secure even though its screenshot contains secure content.

Change-Id: I5a70be71ddfc26de4230e7d4fe547210c2154210
 2014-03-20 11:35:33 +09: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
726104a62a 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:29:46 +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
37c591036a am dd6b7495: am 83725810: Merge "Get rid of noise during boot." 
* commit 'dd6b7495577eca7a00aa37bfdca3449cf1443681':
  Get rid of noise during boot.
 2014-03-20 01:53:08 +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
af9205626f 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:22:59 +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
Colin Cross
19fc55e1e3 Merge "build app_process64 on 64-bit targets" 2014-03-20 01:14:43 +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
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