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

174967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
366d6d0d12 Remove all_modules's dependency on keymaps validation. 
With this we won't try to run validatekeymaps.exe when you run
"USE_MINGW=1 mma".
Also it seems it's too much to run the validation for every mma/mmma.
Validation in just platform build (droidcore) should be enough.

Change-Id: I22431009d4c2dd765bbd14b24eb5c8729b53d6c1
 2015-05-05 16:12:41 -07:00
Hiroshi Yamauchi
ab3dd9fc62 Merge "Fix binder force gc will block binder thread" 2015-05-05 18:58:22 +00:00
Chih-Hung Hsieh
5bd20a3eca Merge "Remove unused aapt target." 2015-05-04 23:36:23 +00:00
Chih-Hung Hsieh
97627314a4 Remove unused aapt target. 
BUG: 20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
 2015-05-04 15:49:46 -07:00
Yang Ni
46358df676 Merge "Sanity checks in JNI code for closure creation" 2015-05-04 22:02:44 +00:00
Chris Tate
a51f14d00e Merge "Fix NPE in JobServiceContext when closing job." 2015-05-02 01:29:45 +00:00
Yang Ni
4e90b9b57c Sanity checks in JNI code for closure creation 
b/20728113

In case the requested size for memory allocation overflows, or memory
allocation fails.

Change-Id: I8dac132dd4d0210938660ffbb82cbe44000d2a90
 2015-05-01 14:39:02 -07:00
mark_chen
d916c233f0 Fix binder force gc will block binder thread 
Symptom: Force gc caused activity launch time took longer
Root Cause: Runtime.getRuntime().gc will block binder thread
Solution: Use VMRuntime.requestConcurrentGC() will not block binder
thread

Bug: 20554807
Change-Id: I48a103c8241c4c85ced4d9a0b231d9f1dc200f35
 2015-05-01 13:42:43 -07:00
Mathieu Chartier
5cc626bb0e Merge "Look at map extensions before /dev/ + ashmem." 2015-05-01 20:18:06 +00:00
Mathieu Chartier
3ed7643916 Look at map extensions before /dev/ + ashmem. 
Prevents stuff like:
dalvik-classes.dex appearing as GC overhead.

(cherry picked from commit 9308462a5972192a1ad9abd01b36e1ad545eef99)

Bug: 20752953
Change-Id: Iab0935e882a5d938651ec2581845d8242aaf98af
 2015-05-01 12:56:25 -07:00
Dan Stoza
adcb47a585 Merge "Adjust display inversion matrix to account for luminance" 2015-04-30 19:36:27 +00:00
riddle_hsu
6a94aba734 Fix NPE in JobServiceContext when closing job. 
Disconnect may come after job is canceled.
Add a finished state to avoid cleanup finished job again.

Real case:
http://code.google.com/p/android/issues/detail?id=170814

Change-Id: I9c7a1b944a8393e30396f473ebeb8332e51f21f1
 2015-05-01 01:52:58 +08:00
John Spurlock
ad61b8336a Merge "Fix no vibration during shutdown." 2015-04-30 12:22:41 +00:00
Alan Viverette
6c06ebe4aa Adjust display inversion matrix to account for luminance 
Bug: 20346301
Change-Id: I10633705f2bfddbdeec063f9489a4f8679b9e8ee
(cherry picked from commit 6437518061fc8718590e0272ed17ea64710d2299)
 2015-04-29 12:26:38 -07:00
Narayan Kamath
815d9bb178 Merge "Add a static dependency on libbase." 2015-04-29 14:09:03 +00:00
Narayan Kamath
9c8ba9666d Add a static dependency on libbase. 
Used by libziparchive.

Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
 2015-04-29 14:07:41 +00:00
Shawn Willden
adbbba9f1d Merge "Add missing error codes from keymaster_defs.h." 2015-04-29 04:30:18 +00:00
Alan Viverette
2ddfcc4ade Merge "Context leaks in EditText causes out of memory" 2015-04-29 04:19:40 +00:00
Mathieu Chartier
91132c4eae Merge "Fix build" 2015-04-28 23:45:25 +00:00
Mathieu Chartier
97a29433c3 Fix build 
Change-Id: Ie056247ee9c4ae7693f3f5f5f68d4322546ee61a
 2015-04-28 16:44:11 -07:00
Mathieu Chartier
e343d61319 Merge "Properly describe exception" 2015-04-28 23:40:31 +00:00
Mathieu Chartier
d12065f581 Properly describe exception 
Previously we used DetachCurrentThread which raised a SIGABRT from
within ART. The new approach is to use ExceptionDescribe and exit.

Bug: 20640601
Change-Id: Ia6c2345b656b2ada29d262399798a6ed717a7f85
 2015-04-28 16:30:30 -07:00
Chad Brubaker
481f22ecda Merge "Add OP_AUTH_NEEDED KeyStore result code" 2015-04-28 20:34:30 +00:00
Alan Viverette
6af08c6b76 Merge "Fix for infinite loop in RemoteViewsAdapter" 2015-04-28 17:10:41 +00:00
Marco Nelissen
375e21f811 Merge "Sometimes the application context is null" 2015-04-28 15:26:54 +00:00
Narayan Kamath
71fa6862f3 Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray" 2015-04-28 08:32:56 +00:00
Taiju Tsuiki
ecd2184873 Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray 
Add a null check for each values of SparseArray in Bundle#hasFileDescriptor
to avoid NullPointerException.

Change-Id: I43ecc01f2759ccbe85b902fa118d55cb74ebf38b
 2015-04-28 09:30:19 +01:00
Narayan Kamath
b736868be9 Merge "Fix NullPointerException in Bundle#hasFileDescriptors" 2015-04-28 08:29:09 +00:00
Taiju Tsuiki
e58c7858a3 Fix NullPointerException in Bundle#hasFileDescriptors 
Add null check for array elements in Bundle#hasFileDescriptors to avoid NPE on
null valued array.

Change-Id: Ic6ef8864ca6add023c7a69ba3c9474b0f6291723
 2015-04-28 09:27:40 +01:00
Shawn Willden
5b8352bd16 Add missing error codes from keymaster_defs.h. 
Bug: 20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
 2015-04-28 00:07:20 -06:00
Andreas Gampe
c29791d56a Merge "Frameworks/base: Add debug.gencfi property" 2015-04-27 15:06:48 +00:00
Narayan Kamath
cf6fc5ee13 Merge "Fix incorrect javadoc for Uri.getQueryParameter." 2015-04-27 10:44:35 +00:00
Narayan Kamath
4356c95354 Fix incorrect javadoc for Uri.getQueryParameter. 
This first went out with Jelly Bean and not ICS.

bug: https://code.google.com/p/android/issues/detail?id=61651
Change-Id: I26f6b18593fe089bd3a52ec1d159494923bcbad1
 2015-04-27 10:42:41 +00:00
Nick Kralevich
e8101c047c Merge "fix compiler error under FORTIFY_SOURCE=2" 2015-04-25 21:22:32 +00:00
Nick Kralevich
9709a1f04c fix compiler error under FORTIFY_SOURCE=2 
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
    ftruncate(fd, mFooterStart);
    ^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1

Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
 2015-04-24 20:27:06 -07:00
Andreas Gampe
a876b35d48 Frameworks/base: Add debug.gencfi property 
Add the debug.gencfi system property that forces generation of
CFI data.

Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
 2015-04-24 16:31:41 -07:00
Wale Ogunwale
e60077e62a Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 2015-04-24 21:49:47 +00:00
Wale Ogunwale
d9bf26522b Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 2015-04-24 21:49:41 +00:00
Wale Ogunwale
1d646128b2 Revert "[ActivityManager] Improve multi-thread access the same provider" 
This reverts commit 57307b21cbdb261eeca081051ed61540dcf905f8.

Bug: 20091132
 2015-04-24 14:45:14 -07:00
Wale Ogunwale
67fe0a450c Revert "Clean-up state if we have an exception when acquiring provider" 
This reverts commit 73e239bdc9493d81215d5afe739b3ed095686ba2.

Bug: 20091132
 2015-04-24 14:44:54 -07:00
Kenny Root
c71f264847 Merge "frameworks/base: switch to using NativeConstants." 2015-04-24 21:26:14 +00:00
Alex Klyubin
e2b9bb45d2 Merge "No runtime exceptions during normal use of AndroidKeyStore crypto." 2015-04-24 20:00:58 +00:00
Chad Brubaker
dabe520a3e Add OP_AUTH_NEEDED KeyStore result code 
OP_AUTH_NEEDED will be returned from begin when an operation needs
a per operation authentication before calling update. Note that the
begin call succeeds when this error is returned, the token and handle
are valid.

Change-Id: I28953add4ffd7d873fc33ba3f2cf788f72b07d06
 2015-04-24 10:57:19 -07:00
Alex Klyubin
ad9ba10ecd No runtime exceptions during normal use of AndroidKeyStore crypto. 
This changes the implementation of AndroidKeyStore-backed Cipher and
Mac to avoid throwing runtime exceptions during normal use. Runtime
exceptions will now be thrown only due to truly exceptional and
unrecoverable errors (e.g., keystore unreachable, or crypto primitive
not initialized).

This also changes the implementation of Cipher to cache any errors
encountered in Cipher.update until Cipher.doFinal which then throws
them as checked exceptions.

Bug: 20525947
Change-Id: I3c4ad57fe70abfbb817a79402f722a0208660727
 2015-04-24 10:54:45 -07:00
Alex Klyubin
71223ebe1b Merge "Reset AndroidKeyStore Mac and Cipher state when init fails." 2015-04-24 17:52:36 +00:00
Alex Klyubin
6c4a842129 Reset AndroidKeyStore Mac and Cipher state when init fails. 
For consistency, this also switches AndroidKeyStore's Mac init/reset
implementation to the same approach as used in Cipher.

Bug: 18088752
Change-Id: Id34caf7cfe04f2058e22d8632890f762927bb31c
 2015-04-24 10:49:11 -07:00
Olawale Ogunwale
cf7d2d95ad Merge "[ActivityManager] Avoid orphan ContentProviderRecord." 2015-04-24 17:43:01 +00:00
Adam Langley
6bf52c4271 frameworks/base: switch to using NativeConstants. 
NativeCrypto is a conscrypt class that contained several OpenSSL
constants. NativeConstants is the new class that contains the same
thing, but the latter is automatically generated and thus won't drift
from the C headers.

Bug: 20521989

Change-Id: I45c7b9a6844a06e3ffd09be692ebf733e1ebbbcc
 2015-04-24 10:00:45 -07:00
Neil Fuller
0e29681f98 Merge "Load ICU4J data on boot" 2015-04-24 10:30:18 +00:00
Neil Fuller
9f7cd10134 Load ICU4J data on boot 
Bug: 20252074
Bug: 20396452
Change-Id: I17de761e0d81caa2fc280b5cc368ee6113a5d655
 2015-04-23 14:50:34 +01:00