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

45067 Commits

Author SHA1 Message Date
Chet Haase
39e991bd5e am f8525caf: am 02e4c3a1: Merge "Cache Scene objects by layout ID on the scene root" into klp-dev 
* commit 'f8525cafbf3df4ec1636782acb95a2d7665bbf5c':
  Cache Scene objects by layout ID on the scene root
 2013-10-23 15:41:03 -07:00
Chet Haase
f8525cafbf am 02e4c3a1: Merge "Cache Scene objects by layout ID on the scene root" into klp-dev 
* commit '02e4c3a1d870be7ced0f70f460d718924f6e348f':
  Cache Scene objects by layout ID on the scene root
 2013-10-23 14:48:45 -07:00
Adam Powell
40a67888f9 Cache Scene objects by layout ID on the scene root 
The current tracking of scene objects in a static ThreadLocal is
problematic as it leaks the Context associated with the SceneRoot and
returns the wrong Scene object if the same layout ID is used across
different scene roots.

Track Scene objects on the scene root view instead to avoid these
issues.

Change-Id: I891986897f757f2666897c937b5ebb0ed1d531c1
 2013-10-23 14:26:57 -07:00
Adam Powell
2c42d8937a am 9390fcbb: am 3e1a9eac: Merge "Import button assets from UX repository" into klp-dev 
* commit '9390fcbbc6a7708d49f494dc245e84aaaa9edcc2':
  Import button assets from UX repository
 2013-10-23 13:33:33 -07:00
Adam Powell
9390fcbbc6 am 3e1a9eac: Merge "Import button assets from UX repository" into klp-dev 
* commit '3e1a9eaca6b5e1c699c9962e3932298751829660':
  Import button assets from UX repository
 2013-10-23 13:31:17 -07:00
Adam Powell
3e1a9eaca6 Merge "Import button assets from UX repository" into klp-dev 2013-10-23 20:28:59 +00:00
Jeff Sharkey
0491eaf621 am 3fa9ce8d: am ca8547b4: Merge "Add notification docs to DocumentsProvider." into klp-dev 
* commit '3fa9ce8dc5540d1df21410d96b97d27196972504':
  Add notification docs to DocumentsProvider.
 2013-10-23 12:27:31 -07:00
Chet Haase
43757cc843 am 2a8eaff4: am c9d8e383: Merge "Fix leak with transitions when views get removed" into klp-dev 
* commit '2a8eaff4ec10f5d554043c73c0e3424186e09a8a':
  Fix leak with transitions when views get removed
 2013-10-23 12:27:27 -07:00
Jeff Sharkey
3fa9ce8dc5 am ca8547b4: Merge "Add notification docs to DocumentsProvider." into klp-dev 
* commit 'ca8547b435d53aef94646d2e6bc31b09a34a086f':
  Add notification docs to DocumentsProvider.
 2013-10-23 12:24:20 -07:00
Chet Haase
2a8eaff4ec am c9d8e383: Merge "Fix leak with transitions when views get removed" into klp-dev 
* commit 'c9d8e38317947c7860dcf6e8df032373ace183e9':
  Fix leak with transitions when views get removed
 2013-10-23 12:24:16 -07:00
Jeff Sharkey
ca8547b435 Merge "Add notification docs to DocumentsProvider." into klp-dev 2013-10-23 19:19:07 +00:00
Chet Haase
c9d8e38317 Merge "Fix leak with transitions when views get removed" into klp-dev 2013-10-23 19:17:10 +00:00
Jeff Sharkey
9352c383e9 Add notification docs to DocumentsProvider. 
Bug: 11272209
Change-Id: I97d67c91c4f4a312cbde82afd9e27509c26517b2
 2013-10-23 12:15:34 -07:00
Martijn Coenen
41fab0a19c am fa191d5a: am d9e98a4b: Merge "Unhide BIND_NFC_SERVICE permission." into klp-dev 
* commit 'fa191d5ac2c513c506ac2db1a9e1e2528de25dc7':
  Unhide BIND_NFC_SERVICE permission.
 2013-10-23 11:17:41 -07:00
Martijn Coenen
fa191d5ac2 am d9e98a4b: Merge "Unhide BIND_NFC_SERVICE permission." into klp-dev 
* commit 'd9e98a4b6d3181ab3d58b7781ee2f88a389ecf1f':
  Unhide BIND_NFC_SERVICE permission.
 2013-10-23 11:14:44 -07:00
Martijn Coenen
d9e98a4b6d Merge "Unhide BIND_NFC_SERVICE permission." into klp-dev 2013-10-23 18:12:06 +00:00
Adam Powell
c03ef006da Import button assets from UX repository 
Bug 11192938

Change-Id: Ib59fd4d288d3ef5f132a4cee2a2e0384053b5594
 2013-10-23 11:09:03 -07:00
Dianne Hackborn
b333244796 am e6a8ccb3: am 2d76a1a0: Merge "Fix issue #11323037: Android apk incorrectly marked as running in app processes" into klp-dev 
* commit 'e6a8ccb3d11a3af2a2d9f0077965d05754abcff3':
  Fix issue #11323037: Android apk incorrectly marked as running in app processes
 2013-10-23 10:49:52 -07:00
Dianne Hackborn
e6a8ccb3d1 am 2d76a1a0: Merge "Fix issue #11323037: Android apk incorrectly marked as running in app processes" into klp-dev 
* commit '2d76a1a068839ac677e909ba8555fe812eaea841':
  Fix issue #11323037: Android apk incorrectly marked as running in app processes
 2013-10-23 10:46:58 -07:00
Dianne Hackborn
2d76a1a068 Merge "Fix issue #11323037: Android apk incorrectly marked as running in app processes" into klp-dev 2013-10-23 17:44:11 +00:00
Martijn Coenen
8c99ab849e Unhide BIND_NFC_SERVICE permission. 
Needs to be held by host-based card emulation
apps in order to work.

Bug: 11352063
Change-Id: I8ba42446cd3066b38309d8e9cbc51d140a023547
 2013-10-23 10:43:16 -07:00
John Spurlock
759bc4f421 am 7539a5af: am 2f566900: Merge "Ensure the simple CAB appears below the status bar." into klp-dev 
* commit '7539a5afa73e9d7bc77803295368542ef535f28c':
  Ensure the simple CAB appears below the status bar.
  Add 'no system permission' test app.
 2013-10-23 10:20:09 -07:00
John Spurlock
7539a5afa7 am 2f566900: Merge "Ensure the simple CAB appears below the status bar." into klp-dev 
* commit '2f566900a4fdeab75c972259a97dfb40b96df421':
  Ensure the simple CAB appears below the status bar.
  Add 'no system permission' test app.
 2013-10-23 10:17:13 -07:00
Dianne Hackborn
237cefbcee Fix issue #11323037: Android apk incorrectly marked as running in app processes 
The android package is now a special case, not being added to the package list
when creating a multi-process component.  There is no need, since this package
is actually the framework itself which must be loaded in every process.

Also cleaned up some of the procstats dump output to help see what is going
on here.

Change-Id: If65d35ecd562f3154bdebfded69c454af6ce8c96
 2013-10-22 19:15:49 -07:00
Brett Chabot
89bd973344 Merge "Add 'no system permission' test app." into klp-dev 2013-10-23 01:17:34 +00:00
Chet Haase
df32aa8715 Fix leak with transitions when views get removed 
Transitions, when started, add an OnPreDrawListener to the current
ViewTreeObserver (which is global to the view hierarchy). This listener
is removed when the listener is called.

It is possible to add this listener and then remove the view from
the hierarchy before the listener is called. This could result in
either the listener not getting called at all (since there was no
drawing event) or (in the case of this bug) the listener getting called
when the sceneRoot had no AttachInfo (which is the case when that
root has been removed from the hierarchy). This results in the listener
trying to remove itself from a *different* ViewTreeObserver than the one
it added itself to, leaving the actual listener still sitting on a list
of listeners in that original VTO. This can result in a growing list of
listeners and a growing amount of work that gets done on every frame.
It can also lead to a serious memory leak, since the objects referred to
by the transition may be non-trivial (as in the case of this bug).

The fix is to add another mechanism for the listener to get removed.
Specifically, we now listen for detach events on the sceneRoot. If that
view gets detached before the listener is called, then we have a chance to
remove it from the correct VTO before the AttachInfo becomes null.

Issue #11307391 keyguard is slow after updating to krt16c and playing music

Change-Id: I108413ea2f18f5351df0a11d4ae56fec0b4aa154
 2013-10-22 16:27:56 -07:00
Baligh Uddin
d94b7ffc2e Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-22 19:48:12 +00:00
Brett Chabot
305258da75 Add 'no system permission' test app. 
Used in PackageManagerOTATests to verify upgraded system apps
are granetd new permissions.

Bug 11271490

Change-Id: Idbc07bc043d06ea15dc41285ecbfb8186a7ecc95
 2013-10-22 04:58:50 +00:00
Matthew Xie
46cfa69137 am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit '9a53fbe44fcf4b3fe740e8b68ad16f2016aca62c':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:07:53 -07:00
Matthew Xie
9a53fbe44f am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 
* commit 'ce39e8ced8bcbc6663d420bea66280f8b438e027':
  Change pairing api/intent permission from PRIVILEGED to ADMIN
 2013-10-21 16:05:26 -07:00
Matthew Xie
ce39e8ced8 Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev 2013-10-21 22:58:53 +00:00
Matthew Xie
ac2c6c3a16 Change pairing api/intent permission from PRIVILEGED to ADMIN 
The APIs are createBond, setPin, setPairingConfirmation
The intent is ACTION_PAIRING_REQUEST
bug 11101076

Change-Id: I3a314efd973b3ce078ab5347159c336f222d9f15
 2013-10-21 14:56:33 -07:00
Victoria Lease
ed82a64828 am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev 
* commit '54b7e3e81c39a5e94fd3dcd67cc4eba0f56351f2':
  Implement language-specific GSUB processing
 2013-10-21 09:01:18 -07:00
Victoria Lease
54b7e3e81c am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev 
* commit 'a80d6424987602cc3141d4cb4cdee21a54747691':
  Implement language-specific GSUB processing
 2013-10-21 08:58:37 -07:00
Victoria Lease
a80d642498 Merge "Implement language-specific GSUB processing" into klp-dev 2013-10-21 15:55:30 +00:00
Baligh Uddin
13d111c925 Import translations. DO NOT MERGE 
Change-Id: Ifefb5cc2d2e9545e3a3c89ec8b2284a04c1bff39
Auto-generated-cl: translation import
 2013-10-21 08:39:26 -07:00
Deepanshu Gupta
7d641de1f6 am a14f25c5: am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev 
* commit 'a14f25c5ef85c026ff575bf7671d8dab8219ae89':
  Don't run the async query if being rendered in EditMode.
 2013-10-20 19:57:47 -07:00
Deepanshu Gupta
a14f25c5ef am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev 
* commit 'bf3acff10a62adeb0e2cefc4652c62132445c196':
  Don't run the async query if being rendered in EditMode.
 2013-10-20 19:54:43 -07:00
Deepanshu Gupta
bf3acff10a Merge "Don't run the async query if being rendered in EditMode." into klp-dev 2013-10-21 02:51:20 +00:00
Scott Main
48f2a25a7f am e26c353c: am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit 'e26c353c4b32f252567887ddb97051546998c6ff':
  add xml attributes to IME javadoc
 2013-10-20 15:32:24 -07:00
Scott Main
e26c353c4b am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit 'bab3348fc39e91b35c30ce05b6222cc5e8544104':
  add xml attributes to IME javadoc
 2013-10-20 15:30:49 -07:00
Scott Main
bab3348fc3 Merge "add xml attributes to IME javadoc" into klp-dev 2013-10-20 22:28:11 +00:00
John Spurlock
a5217f09c5 am 1eeb5ff2: am d4595bd1: Merge "Move the IME navigation guard view up to decor." into klp-dev 
* commit '1eeb5ff203a4aea5a4cfbe6c9982dc77cabd1f2b':
  Move the IME navigation guard view up to decor.
 2013-10-19 10:07:48 -07:00
John Spurlock
1eeb5ff203 am d4595bd1: Merge "Move the IME navigation guard view up to decor." into klp-dev 
* commit 'd4595bd1e60ba03be3dac3cae3fc2d3ae2433c7d':
  Move the IME navigation guard view up to decor.
 2013-10-19 10:05:23 -07:00
John Spurlock
d4595bd1e6 Merge "Move the IME navigation guard view up to decor." into klp-dev 2013-10-19 17:03:55 +00:00
Jonathan Dixon
72950e65c8 am d47be031: am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit 'd47be031378e2ff43d61099ce5502f9428242eaf':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:40:44 -07:00
Jonathan Dixon
d47be03137 am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit '43e533dea968bec3e53ba8046934145a0fa48a4f':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:37:53 -07:00
Jonathan Dixon
43e533dea9 Merge "Restore 4 classes that were accidentally deleted" into klp-dev 2013-10-19 00:35:23 +00:00
Svetoslav Ganov
8a51e2f48c am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit 'a53e1f81380c018705dc56ee82ec2db155f23489':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:32:57 -07:00
Svetoslav Ganov
a53e1f8138 am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit '237575278de8cae5d20ee333fcb2ccceee257d67':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:29:05 -07:00