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

129755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mindy Pereira
11b715da9b Merge "Make touch slop region smaller for watch" into klp-modular-dev 2014-04-30 19:43:59 +00:00
Michael Wright
474b07497b am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '809c369892ddbae908dc47e6a1032a768e9004cb':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 19:11:05 +00:00
Elliott Hughes
f84493ec95 am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp" 
* commit '91ff3c18dbb61ed0087f741dd2bdf911ecf42fef':
  Fix for native leaks in YuvToJpegEncoder.cpp
 2014-04-30 19:07:01 +00:00
Michael Wright
809c369892 am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 
* commit '54c3529b4d3f86488799caa0e62a1f3929a79a39':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
 2014-04-30 19:06:40 +00:00
Michael Wright
54c3529b4d Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent" 2014-04-30 19:02:56 +00:00
Elliott Hughes
91ff3c18db am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp" 
* commit '7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
  Fix for native leaks in YuvToJpegEncoder.cpp
 2014-04-30 19:02:53 +00:00
Elliott Hughes
7d3f9e9730 Merge "Fix for native leaks in YuvToJpegEncoder.cpp" 2014-04-30 18:59:54 +00:00
Igor Viarheichyk
84410b054c Fixes issue causing pseudolocalization of strings 
in non-translatable resource files.

Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
 2014-04-30 11:56:42 -07:00
Mindy Pereira
2920646cbe Make touch slop region smaller for watch 
Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db
 2014-04-30 11:36:59 -07:00
destradaa
cfbdcd2594 Make sure the FlpHardwareProvider is only advertised to GmsCore if the platform supports it. 
b/14117917

Change-Id: Id6c2444893bcf192049e3233d1296eac16fcf826
 2014-04-30 11:31:21 -07:00
Nicolas Prevot
10fa67c77e Introduce forwarding intents across profiles. 
The package manager service maintains, for some user ids, a list of forwarding intent filters.
A forwarding intent filter is an intent filter with a destination (a user id).
If an intent matches the forwarding intent filter, then activities in the destination can also respond to the intent.

When the package manager service is asked for components that resolve an intent:
If the intent matches the forwarding intent filter, and at least one activity in the destination user can respond to the intent:
The package manager service also returns the IntentForwarderActivity.
This activity will forward the intent to the destination.

Change-Id: Id8957de3e4a4fdbc1e0dea073eadb45e04ef985a
 2014-04-30 19:24:52 +01:00
Adrian Roos
08d4a0ab48 Merge "Fix broken trust agent reloading v2" 2014-04-30 17:41:25 +00:00
Kenny Guy
7e5264ced7 Merge "Extend LauncherApps service to expose enabled state." 2014-04-30 17:38:10 +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
Baligh Uddin
821d9a71f6 Import translations. DO NOT MERGE 
Change-Id: I3f7f57ff2f80be58054ca63a878f6644a4d6e827
Auto-generated-cl: translation import
 2014-04-30 10:33:27 -07: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
Baligh Uddin
7a25e41598 Import translations. DO NOT MERGE 
Change-Id: Ia11b15d1e802b1f4fb3afbc9261487a5ab364a7f
Auto-generated-cl: translation import
 2014-04-30 10:25:32 -07: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
Baligh Uddin
0272751180 Import translations. DO NOT MERGE 
Change-Id: I4f33ab6f48410b6cc0e8e8343e2a816090748623
Auto-generated-cl: translation import
 2014-04-30 10:18:33 -07:00
Alexandra Gherghina
f2e7b3f56a Revert "Temporarily switch off returning only enabled profiles to support dogfooding" 
This reverts commit 199c35a21ea9bddde80fdb435ec604f729b0cbe7 because client code has been updated.

Bug: 14132551
Change-Id: I7159087dfaded6f2bfe90ef103f74b242acb166c
 2014-04-30 17:01:03 +00:00
Baligh Uddin
b77014828f Import translations. DO NOT MERGE 
Change-Id: I1ccf4c1b33a7aa11cbf76dd86a2dd13be3f31ab9
Auto-generated-cl: translation import
 2014-04-30 09:48:51 -07:00
Dianne Hackborn
406c51b360 Merge "Switch IProcessObserver to report process state" 2014-04-30 16:39:15 +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
Adrian Roos
a5956424b8 Fix broken trust agent reloading v2 
Bug: 13723878
Change-Id: I61f313bfc7ff0dc502551b54d580a7ce8694f04d
 2014-04-30 18:23:38 +02:00
Narayan Kamath
f53418931b Merge "Fix x86 build in app_process." 2014-04-30 15:59: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
7f89c9b8e6 Merge "Fix NPE when going "back" from Activity Transition." 2014-04-30 14:27:31 +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
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
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
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
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
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
Allen Shen
1c0f21ea84 WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent 
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer

Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
 2014-04-30 17:09:19 +08:00