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

132824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
faafcea025 am 4bec7879: am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint" 
* commit '4bec78790305673ae65438bed9a96b807a4d0e73':
  Cast CallVoidMethod's size_t parameters to jint
 2014-04-30 17:39:29 +00:00
Narayan Kamath
27163724f6 am e05d3b14: am 516130cc: am dbbf431b: am d0f7f418: Merge "Freeing frame map" 
* commit 'e05d3b14f6f5f101c16392318c2d571a37208078':
  Freeing frame map
 2014-04-30 17:39:26 +00:00
Bill Yi
2aecbbf546 am 52d2a028: am d21082ca: am 9a76e9ba: Fix build error 
* commit '52d2a028a04bc8928ba37fee7ae66c080007041c':
  Fix build error
 2014-04-30 17:39:22 +00:00
Michael Wright
9fc1037824 am 9aab6ea4: am 1e67bcec: am 263c36a1: am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper" 
* commit '9aab6ea4ee3f0152b6f9e23377616927923120d3':
  NULL previous background bitmap upon changing wallpaper
 2014-04-30 17:39:18 +00:00
Michael Wright
fef372beb3 am 571bd935: am bba434af: am 10884694: am 357c75e7: Merge "Add missing character combinations for international layouts" 
* commit '571bd935a448397fcf21d0e9b97d3174b1317e49':
  Add missing character combinations for international layouts
 2014-04-30 17:39:15 +00:00
Narayan Kamath
fad6fa7a04 am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint" 
* commit '21ccb07fbe97097b6540097d89dd456447779178':
  Cast CallVoidMethod's size_t parameters to jint
 2014-04-30 17:36:14 +00:00
Narayan Kamath
52adfdaafd am 516130cc: am dbbf431b: am d0f7f418: Merge "Freeing frame map" 
* commit '516130ccb1841afb6ef154c28269d91594925429':
  Freeing frame map
 2014-04-30 17:36:10 +00:00
Bill Yi
10882ec8d7 am d21082ca: am 9a76e9ba: Fix build error 
* commit 'd21082ca0c116ba737e6e93c2917d0b557cc48fc':
  Fix build error
 2014-04-30 17:34:28 +00:00
Michael Wright
a810f11986 am 1e67bcec: am 263c36a1: am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper" 
* commit '1e67bcec505b1bfb67a83cb3d64e20c2bacf8581':
  NULL previous background bitmap upon changing wallpaper
 2014-04-30 17:34:19 +00:00
Michael Wright
02b4777a54 am bba434af: am 10884694: am 357c75e7: Merge "Add missing character combinations for international layouts" 
* commit 'bba434af67600b1fb4a32f2c130526ad9e938f86':
  Add missing character combinations for international layouts
 2014-04-30 17:33:23 +00:00
Selim Cinek
ac1d91c1de am eeffa380: Merge "Fixed a crash of the notification animation on initial startup" 
* commit 'eeffa3804170d1ecb3521cb3911da7d677fa1611':
  Fixed a crash of the notification animation on initial startup
 2014-04-30 17:27:15 +00:00
Selim Cinek
0653363a76 Merge "Fixed a crash of the notification animation on initial startup" 2014-04-30 17:23:21 +00:00
Selim Cinek
39610545f0 Fixed a crash of the notification animation on initial startup 
When no state was applied yet and an animation was started the system
could crash.

Bug: 14430331
Change-Id: Ic8a4532b73f4d70cb365975f055d6630f61e0318
 2014-04-30 19:19:11 +02:00
Dianne Hackborn
c96190e9fe am c6890f9f: Merge "Switch IProcessObserver to report process state" 
* commit 'c6890f9f517f7b09594ebb6aaf5b338fb905b32f':
  Switch IProcessObserver to report process state
 2014-04-30 16:43:13 +00:00
Dianne Hackborn
406c51b360 Merge "Switch IProcessObserver to report process state" 2014-04-30 16:39:15 +00:00
Kenny Root
2a14818810 am c738d55c: resolved conflicts for merge of 3e320a0c to master 
* commit 'c738d55cd082fe35c1d6d3e2c67b4187c4c4c94e':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
 2014-04-30 16:38:00 +00:00
Kenny Root
b3aa8f4804 resolved conflicts for merge of 3e320a0c to master 
Change already in frameworks/native as commit
51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4

Change-Id: I23ae58c86dac91efb5210fdc4f080a1d6fb741c3
 2014-04-30 09:33:22 -07:00
Narayan Kamath
3338cb4481 am 9fe07a3a: Merge "Fix x86 build in app_process." 
* commit '9fe07a3ad4b80f405545d99b52b29b0eb3cfa456':
  Fix x86 build in app_process.
 2014-04-30 16:02:30 +00:00
Narayan Kamath
f53418931b Merge "Fix x86 build in app_process." 2014-04-30 15:59:08 +00:00
Adrian Roos
0628485f93 am 9c920229: Merge "Fix broken trust agent reloading" 
* commit '9c9202296fe8460a7b048350165fd1b576cf7a9b':
  Fix broken trust agent reloading
 2014-04-30 15:55:08 +00:00
Adrian Roos
e2b2514342 Merge "Fix broken trust agent reloading" 2014-04-30 15:51:48 +00:00
Adrian Roos
81e046645d Fix broken trust agent reloading 
Bug: 13723878
Change-Id: I2f7f3fad5685e5e57dcddf2f2c3494bb95e38b15
 2014-04-30 17:48:18 +02:00
Narayan Kamath
6eb1b2611c Fix x86 build in app_process. 
Look for __i386__ and not __x86__.

Change-Id: Iffa3709f9d0c96cce17f3183a6f036a78eccc787
 2014-04-30 16:45:07 +01:00
Narayan Kamath
21ccb07fbe am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint" 
* commit '414d94059f3559b67b4da25a34de6d5312abe06f':
  Cast CallVoidMethod's size_t parameters to jint
 2014-04-30 15:37:58 +00:00
Narayan Kamath
516130ccb1 am dbbf431b: am d0f7f418: Merge "Freeing frame map" 
* commit 'dbbf431b289bb7a01b43db3412ecab00abe18362':
  Freeing frame map
 2014-04-30 15:37:44 +00:00
Narayan Kamath
414d94059f am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint" 
* commit '56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
  Cast CallVoidMethod's size_t parameters to jint
 2014-04-30 15:13:02 +00:00
Narayan Kamath
dbbf431b28 am d0f7f418: Merge "Freeing frame map" 
* commit 'd0f7f41828493b0679e908f7bb3ed3b8e838c463':
  Freeing frame map
 2014-04-30 15:12:58 +00:00
George Mount
b0b8c005d7 am 50642dc0: Merge "Fix NPE when going "back" from Activity Transition." 
* commit '50642dc0c1d2942113e8a2880f0c709af43463a3':
  Fix NPE when going "back" from Activity Transition.
 2014-04-30 14:30:29 +00:00
George Mount
7f89c9b8e6 Merge "Fix NPE when going "back" from Activity Transition." 2014-04-30 14:27:31 +00:00
Jorim Jaggi
b1ceae0550 am 68fb7b84: Merge "NotificationRowLayout shall rest in its grave." 
* commit '68fb7b84318d46fb222986c0d5c26958f932591f':
  NotificationRowLayout shall rest in its grave.
 2014-04-30 13:56:57 +00:00
Jorim Jaggi
8f72e8967b Merge "NotificationRowLayout shall rest in its grave." 2014-04-30 13:53:02 +00:00
Jorim Jaggi
59c77fee17 NotificationRowLayout shall rest in its grave. 
Long live the stack scroller. Also removed some other unused classes.

Change-Id: Iff126a0e74e13caadb6426d5e0e76ba800489d3f
 2014-04-30 15:45:25 +02:00
Narayan Kamath
56cd8dbfbd Merge "Cast CallVoidMethod's size_t parameters to jint" 2014-04-30 13:34:04 +00:00
Jorim Jaggi
65e4a4ee30 am ed8b4ca0: Merge "Layout notifications on top and introduce artifical margin" 
* commit 'ed8b4ca093d8aba40d29ef7ad701b28f8c313d97':
  Layout notifications on top and introduce artifical margin
 2014-04-30 13:31:27 +00:00
Jorim Jaggi
984f6b7519 Merge "Layout notifications on top and introduce artifical margin" 2014-04-30 13:28:17 +00:00
Jorim Jaggi
8c1a44b62f Layout notifications on top and introduce artifical margin 
This allows for animating the notifications between the different
states. So we can nicely switch between Keyguard and full shade,
and make the stack smaller when going to quick settings.

Change-Id: I768dc7cd8f4dc0197365a5befebad24086816a8d
 2014-04-30 15:25:56 +02:00
Bill Yi
29aa2f5645 am a6ffeb36: am ad85d542: am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit 'a6ffeb36ac36dd30c829c0316bbc7ddc3d4484e0':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-04-30 12:59:52 +00:00
Bill Yi
8ec7d60cd2 am ad85d542: am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD 
* commit 'ad85d5422b46a44e9a2166436c34c11e59d30e0c':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-04-30 12:51:01 +00:00
Narayan Kamath
cae15aa3b3 am 6609990e: Don\'t adjust ABI if PackageSetting#pkg is null. 
* commit '6609990e35b11c38f55f6e632160d4f2ff201ea3':
  Don't adjust ABI if PackageSetting#pkg is null.
 2014-04-30 12:42:33 +00:00
Narayan Kamath
ab45d1d6d2 Don't adjust ABI if PackageSetting#pkg is null. 
If means the package hasn't been scanned yet, and we
will adjust the ABI during the scan of the last package
in the shared user group.

NOTE: This needs some more cleaning up, which will be
done along with the remaining TODO in this function.

Change-Id: Ie332806b64e22ab4a4856e1ccd064ff6a01616bf
 2014-04-30 13:36:37 +01:00
Youngsang Cho
a17703ce4f am a6edd3ed: Merge "Explictly release the surface in TV input framework" 
* commit 'a6edd3ed2caf732359ce1156f5881b5ab35f13cc':
  Explictly release the surface in TV input framework
 2014-04-30 11:10:10 +00:00
Youngsang Cho
36c492cf1a Merge "Explictly release the surface in TV input framework" 2014-04-30 11:07:29 +00:00
Youngsang Cho
f836206818 Explictly release the surface in TV input framework 
Change-Id: Id178e8959f9c25d1d5f1ab85d5e8455577570d11
 2014-04-30 20:05:32 +09:00
Narayan Kamath
d0f7f41828 Merge "Freeing frame map" 2014-04-30 10:58:31 +00:00
Mykola Kondratenko
0c1eeb3c8a Freeing frame map 
FileMap memory is never released until application exit

Release it now as the texture is already loaded and the memory
used for the packed resource can be released.

Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
 2014-04-30 10:58:20 +00:00
Narayan Kamath
c0b682b4ae am 51a6f925: Fix dex file pruning logic. 
* commit '51a6f9253399588eedf77d75c578d9aa23d11529':
  Fix dex file pruning logic.
 2014-04-30 10:10:46 +00:00
Narayan Kamath
037ebc9c7c am 85703d58: Adjust instruction sets for shared UID apps. 
* commit '85703d58af1dac692d7d83c03220e45ab2a5aded':
  Adjust instruction sets for shared UID apps.
 2014-04-30 10:10:43 +00:00
Narayan Kamath
0e4fa6ea7b am b4d35dc8: Package manager changes for dual zygote stack. 
* commit 'b4d35dc8e9702f9d0d82d35a105f0eea35672b52':
  Package manager changes for dual zygote stack.
 2014-04-30 10:10:40 +00:00
Narayan Kamath
f6b635e4f0 Fix dex file pruning logic. 
We should now prune all normal files from /data/dalvik-cache
in addition to looking for dex files in all subdirectories of
/data/dalvik-cache.

Change-Id: I4abb2b01b359bbb1b8ece2c9025541a5d5e335f5
 2014-04-30 10:30:12 +01:00
Narayan Kamath
64a48c5131 am a669e019: Merge "Create arch specific cache dirs during zygote startup." 
* commit 'a669e019825a333a9a539f554c84c9f855654595':
  Create arch specific cache dirs during zygote startup.
 2014-04-30 08:46:41 +00:00