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

116339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
989769ef95 am 94de60cc: am e431b97c: Merge "Fixed Drag-and-Drop sample code" 
* commit '94de60cccc2ac971aa5a63edd1783e99956473c4':
  Fixed Drag-and-Drop sample code
 2013-10-29 18:31:04 -07:00
Jeff Brown
4c62da692c am 145cac85: am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage" 
* commit '145cac85f8ff077447d282c147e4c8865833b76a':
  Memory leak in IInputMethodSessionWrapper executeMessage
 2013-10-29 18:31:00 -07:00
Jeff Brown
81b7caf0d1 resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp 
Change-Id: I769e7acbe207b9c3a60ff1576d11b3ab40b8c66d
 2013-10-29 18:28:57 -07:00
Michael Wright
f129536f8e am e64a8bbc: am e4035827: Merge "Always initialize local boolean variables when possible" into klp-dev 
* commit 'e64a8bbc37bf3370fb315c1a353274bc7481e352':
  Always initialize local boolean variables when possible
 2013-10-29 16:59:53 -07:00
Michael Wright
e64a8bbc37 am e4035827: Merge "Always initialize local boolean variables when possible" into klp-dev 
* commit 'e403582708acdb89108d606f64c99317e25f1247':
  Always initialize local boolean variables when possible
 2013-10-29 16:57:01 -07:00
Michael Wright
e403582708 Merge "Always initialize local boolean variables when possible" into klp-dev 2013-10-29 23:53:55 +00:00
Christopher Tate
94de60cccc am e431b97c: Merge "Fixed Drag-and-Drop sample code" 
* commit 'e431b97c1f1692a42c9a348a5ff930f82eee2537':
  Fixed Drag-and-Drop sample code
 2013-10-29 15:05:54 -07:00
Christopher Tate
e431b97c1f Merge "Fixed Drag-and-Drop sample code" 2013-10-29 22:02:06 +00:00
Igor Murashkin
6ec49e58ab am 73a523d9: am e5c1208e: Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev 
* commit '73a523d9bfe28ca0b1b5d5875176290b00865d14':
  am: Increase dropbox buffer size to 256KB (from 128KB)
 2013-10-29 14:25:30 -07:00
Igor Murashkin
73a523d9bf am e5c1208e: Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev 
* commit 'e5c1208ef9ef7d10b5bae6c82b9eb5a92da1244e':
  am: Increase dropbox buffer size to 256KB (from 128KB)
 2013-10-29 14:23:06 -07:00
Igor Murashkin
e5c1208ef9 Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev 2013-10-29 21:20:54 +00:00
Michael Wright
f583d0dcc6 Always initialize local boolean variables when possible 
It's currently possible to reference deviceModeChanged in InputReader
while it's in an unknown state. Change the style of initialization
here and a few other places to better prevent this type of error.

Bug: 11433748
Change-Id: Ib332406aefb7cdb16b6a21e00dceaeca34679853
 2013-10-29 14:17:54 -07:00
Jeff Brown
145cac85f8 am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage" 
* commit '4bf6eb1775649a803efcc6da8f06e5083ed24f34':
  Memory leak in IInputMethodSessionWrapper executeMessage
 2013-10-29 14:06:07 -07:00
Jeff Brown
5214dae44c am 6dbbba4e: Merge "handle negative temperature" 
* commit '6dbbba4e9adc3f1c2481698e42f4ffc0c68937f1':
  handle negative temperature
 2013-10-29 14:02:34 -07:00
John Spurlock
646f19c929 am de50a5e7: am 927d854f: Merge "Optimize sysui ui queue during keyguard unlock." into klp-dev 
* commit 'de50a5e7e116870cded377c77c5dbe8fa2498b40':
  Optimize sysui ui queue during keyguard unlock.
 2013-10-29 14:01:56 -07:00
Jeff Brown
4bf6eb1775 Merge "Memory leak in IInputMethodSessionWrapper executeMessage" 2013-10-29 21:01:13 +00:00
Jeff Brown
6dbbba4e9a Merge "handle negative temperature" 2013-10-29 20:59:38 +00:00
John Spurlock
de50a5e7e1 am 927d854f: Merge "Optimize sysui ui queue during keyguard unlock." into klp-dev 
* commit '927d854ff4dc66edd22c109400233eb2d76dfce6':
  Optimize sysui ui queue during keyguard unlock.
 2013-10-29 13:57:16 -07:00
John Spurlock
927d854ff4 Merge "Optimize sysui ui queue during keyguard unlock." into klp-dev 2013-10-29 20:55:04 +00:00
Jeff Sharkey
8f54193832 am 23ac234e: am 704269ec: Merge "Mention external storage changes in KITKAT docs." into klp-dev 
* commit '23ac234e9049512696c7e7c6f277e334fde50f7a':
  Mention external storage changes in KITKAT docs.
 2013-10-29 13:52:58 -07:00
Jeff Sharkey
88c84f9718 am dd225d28: am 7fbba162: Merge "Suppress OperationCanceledException logging." into klp-dev 
* commit 'dd225d28e6e7a57a9ae70c4a7f6217358e3a2052':
  Suppress OperationCanceledException logging.
 2013-10-29 13:52:54 -07:00
Jeff Sharkey
23ac234e90 am 704269ec: Merge "Mention external storage changes in KITKAT docs." into klp-dev 
* commit '704269ec1cea0f68e21f51342d4d05825a53ae6a':
  Mention external storage changes in KITKAT docs.
 2013-10-29 13:49:42 -07:00
Jeff Sharkey
dd225d28e6 am 7fbba162: Merge "Suppress OperationCanceledException logging." into klp-dev 
* commit '7fbba1622a975782fddb9a7c5d9dd733dd4e425d':
  Suppress OperationCanceledException logging.
 2013-10-29 13:49:39 -07:00
Jeff Sharkey
704269ec1c Merge "Mention external storage changes in KITKAT docs." into klp-dev 2013-10-29 20:46:42 +00:00
Jeff Sharkey
7fbba1622a Merge "Suppress OperationCanceledException logging." into klp-dev 2013-10-29 20:46:39 +00:00
Elliott Hughes
ed84dea928 am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs." 
* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
  Fix a variety of small publicly-reported bugs.
 2013-10-29 13:35:04 -07:00
Elliott Hughes
8f592378a1 am 69920427: Merge "Fix a variety of small publicly-reported bugs." 
* commit '69920427ea01421d34f3a7576bdd135527b20859':
  Fix a variety of small publicly-reported bugs.
 2013-10-29 13:32:33 -07:00
Elliott Hughes
69920427ea Merge "Fix a variety of small publicly-reported bugs." 2013-10-29 20:30:27 +00:00
John Spurlock
2fcefe4571 am 161e43dc: am 1b5bd6b6: Merge "Update QS settings icon, remove unused location icon." into klp-dev 
* commit '161e43dc5952a607a5996ab2cd07ac3ef49c2902':
  Update QS settings icon, remove unused location icon.
 2013-10-29 13:29:34 -07:00
John Spurlock
161e43dc59 am 1b5bd6b6: Merge "Update QS settings icon, remove unused location icon." into klp-dev 
* commit '1b5bd6b68af0f26dc0f42e442a9ffa8e1f30e3e5':
  Update QS settings icon, remove unused location icon.
 2013-10-29 13:26:44 -07:00
Michael Wright
0116f08b38 am 961cc671: am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev 
* commit '961cc6717a59eaff449acf1ddd3d3857d8c47430':
  Speculatively schedule input consumption
 2013-10-29 13:26:06 -07:00
Michael Wright
961cc6717a am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev 
* commit '3f8367415095651e9dd8e074f97659a1b633e900':
  Speculatively schedule input consumption
 2013-10-29 13:23:17 -07:00
John Spurlock
1b5bd6b68a Merge "Update QS settings icon, remove unused location icon." into klp-dev 2013-10-29 20:21:50 +00:00
Michael Wright
3f83674150 Merge "Speculatively schedule input consumption" into klp-dev 2013-10-29 20:20:45 +00:00
Elliott Hughes
c367d48c55 Fix a variety of small publicly-reported bugs. 
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556

Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546

Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
 2013-10-29 13:12:55 -07:00
Jeff Sharkey
3ec2f60ebd Mention external storage changes in KITKAT docs. 
Bug: 11388971
Change-Id: I97145472948867f54125f1d0f0237bf3b339535e
 2013-10-29 12:23:19 -07:00
Jeff Sharkey
66d079bf25 am f7eb3398: am 19949b9d: Merge "Guard against missing document columns." into klp-dev 
* commit 'f7eb3398f16f4d76d2a342cf571040360d5a6df6':
  Guard against missing document columns.
 2013-10-29 11:58:21 -07:00
Jeff Sharkey
33819318f6 Suppress OperationCanceledException logging. 
These exceptions are normal when an app has cancelled an outstanding
thumbnail request.

Bug: 11385378
Change-Id: I8aed5721b447cda5baf447ac7afd627aa1062863
 2013-10-29 11:56:37 -07:00
Jeff Sharkey
f7eb3398f1 am 19949b9d: Merge "Guard against missing document columns." into klp-dev 
* commit '19949b9d3de584b283fa9d1ef2489d3e97a3b41a':
  Guard against missing document columns.
 2013-10-29 11:56:27 -07:00
Jeff Sharkey
19949b9d3d Merge "Guard against missing document columns." into klp-dev 2013-10-29 18:53:41 +00:00
Jeff Sharkey
5d321d472d Guard against missing document columns. 
When filtering and sorting, guard against missing columns to avoid
crashing entire app.

Bug: 11377065
Change-Id: I04f035c918d743bcc84592f05e3ef9ad0ebfadce
 2013-10-29 11:48:30 -07:00
Dirk Dougherty
b752c1b559 am 718991b6: am 24445c35: Doc change: fix docs build. 
* commit '718991b69c3a19d3992f5151b256df3589ed3f58':
  Doc change: fix docs build.
 2013-10-29 11:41:15 -07:00
Dirk Dougherty
718991b69c am 24445c35: Doc change: fix docs build. 
* commit '24445c35211a85a92a68527fb93271eadc8d822d':
  Doc change: fix docs build.
 2013-10-29 11:38:28 -07:00
Dirk Dougherty
24445c3521 Doc change: fix docs build. 
Change-Id: Ifdb25d52629e62b0e909aa3ac00bff4df257ffd2
 2013-10-29 11:33:33 -07:00
John Spurlock
e7c285725d Optimize sysui ui queue during keyguard unlock. 
Target the two biggest offenders:
 - Coalesce keyguard setHidden(false) calls during unlock.
 - Make sysui->WM call async.

Found during investigation into b/11221659.

Bug: 11221659
Change-Id: Icab48376bc356a933e0f9940bc2f924e2e77ab22
 2013-10-29 14:27:41 -04:00
Dirk Dougherty
96e6ef623a am 57449569: am 3bdf60dc: Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev 
* commit '57449569b7290c56f823e90bbfa1281e982ae5f5':
  Doc change: Add update ProGuard keep rules for Google Play Services.
 2013-10-29 10:44:38 -07:00
Dirk Dougherty
57449569b7 am 3bdf60dc: Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev 
* commit '3bdf60dc290f24d4f3f994466fb2f19d4e01d833':
  Doc change: Add update ProGuard keep rules for Google Play Services.
 2013-10-29 10:42:56 -07:00
Chris Wren
e0b3f3e106 am 4742fe3c: am 64742f84: Merge "show duration instead of remaining time." into klp-dev 
* commit '4742fe3cd79cf1f7d0c84ba87ee3ebdd5eb175d0':
  show duration instead of remaining time.
 2013-10-29 10:41:09 -07:00
Chris Wren
af5d6e4952 am f535a6ae: am 5ab93d87: Merge "reduce garbage generation in KeyguardTransportControlView." into klp-dev 
* commit 'f535a6aef04b9673a0f6748da0018b962833dd9e':
  reduce garbage generation in KeyguardTransportControlView.
 2013-10-29 10:41:06 -07:00
Dirk Dougherty
3bdf60dc29 Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev 2013-10-29 17:40:49 +00:00