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

97697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
bc897302af Turn off IP2. 
Change-Id: I1d45b0077c1a57c74e36fa8df45428b06a454253
 2012-12-13 14:26:12 -08:00
Jeff Brown
d90a56fadc Merge "Track app and display wakelocks separately." 2012-12-12 16:49:30 -08:00
Jeff Brown
27f7a866f5 Track app and display wakelocks separately. 
Change the power manager to use two different kernel wakelocks
to distinguish between an application or the display keeping the
CPU alive.  This may help make the output of "dumpsys batteryinfo"
easier to interpret.

Bug: 7726759
Change-Id: Iaff96ad74030d00200617b459679ea16390a8da5
 2012-12-12 16:20:17 -08:00
Craig Mautner
6cf1a66348 Merge "Call adjustWallpaperWindowsLocked once per pass." 2012-12-12 15:35:57 -08:00
Stephen Hines
a52b503b2e Merge "Compatibility lib changes for IP2." 2012-12-12 15:02:54 -08:00
Nick Kralevich
0490f02eb7 Merge "Remove unused code." 2012-12-12 12:43:36 -08:00
Nick Kralevich
ddb622e728 Merge "Add new protected broadcasts" 2012-12-12 12:41:13 -08:00
Amith Yamasani
912f01865a am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '68c308607b01bafd31c91572a81f4563e2199260':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:46:41 -08:00
Amith Yamasani
68c308607b am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '73f24ae1d9992cf70cb05bc319d12478b2c49566':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:43:21 -08:00
Amith Yamasani
73f24ae1d9 am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '9a1473406f634ea541bd1643dc70d9aae8c10e77':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:41:14 -08:00
Amith Yamasani
9a1473406f Merge "Don't update global table when upgrading secondary users' database." into jb-mr1.1-dev 2012-12-12 11:39:18 -08:00
Baligh Uddin
ca059d6d1f Merge "Import translations. DO NOT MERGE" 2012-12-12 11:34:33 -08:00
Baligh Uddin
a60f5545ca am cd281b79: (-s ours) am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE 
* commit 'cd281b7929b208126ccc17c7cca4aeedf934b3ea':
  Import translations. DO NOT MERGE
 2012-12-12 11:28:12 -08:00
Baligh Uddin
cd281b7929 am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE 
* commit '1858bfd1a5d951b8c14f81b11172dfed84f5d87f':
  Import translations. DO NOT MERGE
 2012-12-12 11:26:13 -08:00
Baligh Uddin
75e72013bc Import translations. DO NOT MERGE 
Change-Id: I2aacaa12b308eaa3813d6793a78ec24177bc88fc
Auto-generated-cl: translation import
 2012-12-12 11:24:31 -08:00
Baligh Uddin
f0a2ae27a7 am 47d2db68: (-s ours) am f1c6f1d3: Import translations. DO NOT MERGE 
* commit '47d2db689d52ead99799272b104cf6c8cd8a889a':
  Import translations. DO NOT MERGE
 2012-12-12 11:24:29 -08:00
Baligh Uddin
1858bfd1a5 am 90e41469: Import translations. DO NOT MERGE 
* commit '90e41469fe99e52de2144ed24d005a1b30e5f917':
  Import translations. DO NOT MERGE
 2012-12-12 11:24:00 -08:00
Baligh Uddin
47d2db689d am f1c6f1d3: Import translations. DO NOT MERGE 
* commit 'f1c6f1d3870707c4f76261219de0bb2968bf2d31':
  Import translations. DO NOT MERGE
 2012-12-12 11:22:04 -08:00
Baligh Uddin
90e41469fe Import translations. DO NOT MERGE 
Change-Id: I19d85dc7580e4a4e20a89bc3d56fe8a434d8f585
Auto-generated-cl: translation import
 2012-12-12 11:14:26 -08:00
Baligh Uddin
f1c6f1d387 Import translations. DO NOT MERGE 
Change-Id: I6079f968a77282ed15f6a46b05dd2318c1c39ba2
Auto-generated-cl: translation import
 2012-12-12 11:11:44 -08:00
Jeff Sharkey
0813894118 am 764bc0a7: am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts." 
* commit '764bc0a7ae9c623f18aceadda2d5d894b1bf4024':
  Remove unnecessary locking for screen broadcasts.
 2012-12-12 11:11:13 -08:00
Jeff Sharkey
764bc0a7ae am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts." 
* commit 'bf8de6a349e19b32a1577080a9d8bb7f92b2301f':
  Remove unnecessary locking for screen broadcasts.
 2012-12-12 11:06:36 -08:00
Jamie Gennis
7efad644c5 Merge "stop using a deprecated SurfaceTextureClient ctor" 2012-12-12 10:57:20 -08:00
Jeff Sharkey
bf8de6a349 Merge "Remove unnecessary locking for screen broadcasts." 2012-12-12 10:41:20 -08:00
Nick Kralevich
4d254266a4 Remove unused code. 
Change-Id: I6785cea91c0ab2c367645201fb8862dbf1a55773
 2012-12-12 10:38:40 -08:00
Robert Greenwalt
4274d3f6f3 Merge "Removing unused INITING state." 2012-12-12 10:14:18 -08:00
Craig Mautner
ae44659f30 Call adjustWallpaperWindowsLocked once per pass. 
Also refactor a few methods and improve logging.

Change-Id: Ic54a1ff99f6de732b31cda5c06d36e8de01a269c
 2012-12-12 10:09:19 -08:00
Amith Yamasani
2d43fabaf7 Don't update global table when upgrading secondary users' database. 
Bug: 7722149
Change-Id: I0c1373cba316b924701136579083274eb6c9b1da
 2012-12-12 09:52:26 -08:00
Irfan Sheriff
fdb9138c40 Merge "Expose more details in broadcasts" 2012-12-12 09:29:13 -08:00
The Android Open Source Project
3c1ded1664 am e08791c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'e08791c8318216b7934742681edfab57b8147d78':
 2012-12-12 07:36:27 -08:00
The Android Open Source Project
e08791c831 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I3041300565b33629c8d2609a75d384b731f292ce
 2012-12-12 07:34:03 -08:00
Irfan Sheriff
3a67e2515b Expose more details in broadcasts 
Expose details in broadcasts and do the necessary clean up alongside

Change-Id: I9011d51675a233aa3542f097c8a489c2095103b1
 2012-12-11 22:00:14 -08:00
Stephen Hines
f43ac732e1 Compatibility lib changes for IP2. 
Bug: 7419958
Change-Id: Ibd62c06b60875e17d232e27f1845ce0ffafff834
 2012-12-11 19:59:52 -08:00
Adam Powell
2331b42328 am dc4beb48: am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
* commit 'dc4beb483eb14f1b56154125c67b780802756572':
  Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
 2012-12-11 19:12:45 -08:00
Adam Powell
dc4beb483e am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
* commit 'e7ec492f13355888c90b3f08fbc66e49dda7ed24':
  Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
 2012-12-11 19:10:45 -08:00
Adam Powell
90f4c5c9d4 am c6f05e93: am d22843a8: Merge "Fix regression in ListView click handling" 
* commit 'c6f05e93dc37db67addcd19ff87ba013ba817035':
  Fix regression in ListView click handling
 2012-12-11 18:04:23 -08:00
Adam Powell
c6f05e93dc am d22843a8: Merge "Fix regression in ListView click handling" 
* commit 'd22843a8a8d240fc09291b1b9505d62c1f0c0f8d':
  Fix regression in ListView click handling
 2012-12-11 18:02:30 -08:00
Adam Powell
e7ec492f13 Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 2012-12-11 18:00:49 -08:00
Adam Powell
d22843a8a8 Merge "Fix regression in ListView click handling" 2012-12-11 17:57:58 -08:00
Jason Sams
0d0c4e136a Merge "Minor cleanup of a few RS filter ports." 2012-12-11 17:06:45 -08:00
Jamie Gennis
82bb813f11 stop using a deprecated SurfaceTextureClient ctor 
Change-Id: Ie6196ba4896c0ab37b9aed3d1a4ffd04c99c5f80
 2012-12-11 17:02:31 -08:00
Robert Greenwalt
1d42a09715 am f6610e2d: am 79e0e3fd: Merge "return value of String.replace() is ignored." 
* commit 'f6610e2d7d883653ef80077df649e4dd91c221c1':
  return value of String.replace() is ignored.
 2012-12-11 16:54:33 -08:00
Robert Greenwalt
f6610e2d7d am 79e0e3fd: Merge "return value of String.replace() is ignored." 
* commit '79e0e3fd69ba6426da6575e0c778eff205318172':
  return value of String.replace() is ignored.
 2012-12-11 16:52:39 -08:00
Robert Greenwalt
79e0e3fd69 Merge "return value of String.replace() is ignored." 2012-12-11 16:34:35 -08:00
Christopher Tate
1423fa30c2 am 1de62393: am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev 
* commit '1de623939090993d03a7c398d09e2d13950d682b':
  Make immersive mode public & imply update locking
 2012-12-11 16:15:38 -08:00
Christopher Tate
1de6239390 am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev 
* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
  Make immersive mode public & imply update locking
 2012-12-11 16:13:51 -08:00
Christopher Tate
534de491e6 Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev 2012-12-11 16:11:00 -08:00
The Android Automerger
d33ef85086 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-11 15:56:27 -08:00
Adam Powell
847be7445e Fix regression in ListView click handling 
Regression caused by patch a607223f34

If an item click handler results in the ListView becoming detached
from the window, the performClick runnable could be executed twice.
Null out the mTouchModeReset runnable before running the click handler
so that it is not run by the detach handler.

Change-Id: I2fab60232027bb4876f9912088e0ffb9b17d308c
 2012-12-11 15:56:10 -08:00
Kenny Root
0c312368cb am 8f276515: am ae5cc868: am 2735795f: Merge "If freeCache deletes APK, give out of space error" into jb-mr1.1-dev 
* commit '8f276515ea7204f54c773c29eb14a9346f2fa973':
  If freeCache deletes APK, give out of space error
 2012-12-11 15:27:26 -08:00