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

120106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
9feab5f278 am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()" 
* commit '8a02b20f6f3fdd5baa5d22321769303ce76ba80a':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
 2014-04-30 00:03:29 +00:00
Michael Wright
357c75e747 Merge "Add missing character combinations for international layouts" 2014-04-30 00:01:38 +00:00
Michael Wright
8a02b20f6f Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()" 2014-04-29 23:58:17 +00:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Nick Kralevich
1866e5dc8b am af40649e: Merge "Set NO_NEW_PRIVS on zygote init" 
* commit 'af40649e4ad506e312b53518cd2b9f2b58dee3ba':
  Set NO_NEW_PRIVS on zygote init
 2014-04-29 22:24:32 +00:00
Nick Kralevich
af40649e4a Merge "Set NO_NEW_PRIVS on zygote init" 2014-04-29 22:20:47 +00:00
Nick Kralevich
195c73c9b2 Set NO_NEW_PRIVS on zygote init 
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.

In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.

Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
 2014-04-29 15:10:58 -07:00
Selim Gurun
c23f5651fd am 5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub" 
* commit '5c220cc4e4c0584a9083529b58e30e17ab7d2d9e':
  DO NOT MERGE Add invokeFunctor stub
 2014-04-29 18:45:53 +00:00
Selim Gurun
5c220cc4e4 Merge "DO NOT MERGE Add invokeFunctor stub" 2014-04-29 18:42:25 +00:00
Bo Liu
02931d9af6 DO NOT MERGE Add invokeFunctor stub 
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
 2014-04-29 11:38:37 -07:00
Mathieu Meisser
04f8532776 Add missing character combinations for international layouts 
Czech: add missing capslock for numbers and shift+ralt
mappings.
Slovak: fix wrong ralt mappings, add missing ralt mappings
and fixed wrong PLUS key character.
US intl: add missing capslock+ralt support.
Swiss French and Swiss German: add missing ralt mapping for key
numbers 4 and 5, and add missing capslock and capslock+
shift for SEMICOLON and APOSTROPHE.

Change-Id: I02c94bf13d5268d5d1e648c96b7251cb7564f233
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
 2014-04-29 16:52:40 +02:00
Elliott Hughes
7af8f5ba9c am 10d57c4b: Merge "Fix two zygote imports." 
* commit '10d57c4bc7459d0c73b254af006a3528e9a0c33e':
  Fix two zygote imports.
 2014-04-29 04:01:01 +00:00
Elliott Hughes
cf939672f8 am 2e9d924d: Merge "Remove unused import." 
* commit '2e9d924d4f4275c72df4be28d85482064cee43f8':
  Remove unused import.
 2014-04-29 03:56:19 +00:00
Elliott Hughes
10d57c4bc7 Merge "Fix two zygote imports." 2014-04-29 03:54:49 +00:00
Elliott Hughes
a9569ff70f Fix two zygote imports. 
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
 2014-04-28 20:53:52 -07:00
Elliott Hughes
2e9d924d4f Merge "Remove unused import." 2014-04-29 03:52:11 +00:00
Elliott Hughes
f25f14eeba Remove unused import. 
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
 2014-04-28 20:51:34 -07:00
Elliott Hughes
fff28619d8 am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit 'f4a7ac00a734343b8d2760def352cbdf99fa08c7':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:31:34 +00:00
Elliott Hughes
f4a7ac00a7 Merge "Move the Zygote off libcore.os and onto android.system." 2014-04-29 02:28:07 +00:00
Elliott Hughes
860c5911a2 Move the Zygote off libcore.os and onto android.system. 
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
 2014-04-28 19:19:13 -07:00
Elliott Hughes
12928a07c5 am 2336c4ec: Merge "Fix build." 
* commit '2336c4ecc5735eb374e5c804b1fe863650c24d7f':
  Fix build.
 2014-04-28 19:45:06 +00:00
Elliott Hughes
2336c4ecc5 Merge "Fix build." 2014-04-28 19:41:24 +00:00
Elliott Hughes
9790190fee Fix build. 
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
 2014-04-28 12:40:12 -07:00
Elliott Hughes
685a0a72d4 am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit 'bbd87eb9193e9730869171324ee4f5fc1abeae55':
  Track libcore.os' move to android.system.
 2014-04-28 18:17:06 +00:00
Elliott Hughes
bbd87eb919 Merge "Track libcore.os' move to android.system." 2014-04-28 18:14:00 +00:00
Mathieu Chartier
18582a827c am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS." 
* commit '0cd623bb9f832194cdd9c08625fa32583e947c76':
  Use Runtime.gc instead of System.gc for DDMS.
 2014-04-28 18:13:07 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
Mathieu Chartier
0cd623bb9f Merge "Use Runtime.gc instead of System.gc for DDMS." 2014-04-28 18:10:42 +00:00
Mathieu Chartier
83f7d0d67f Use Runtime.gc instead of System.gc for DDMS. 
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.

Bug: 14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
 2014-04-28 11:07:22 -07:00
Stefan Wysocki
22d3990273 Set ActionMode title to the number of selected files 
After change of orientation ActionMode is recreated without previously
set title. It needs to be updated in onCreateActionMode callback.

Change-Id: If5f36e8ad6d1b5cf04ed242611fd037969d73517
 2014-04-28 10:47:34 +02:00
Wink Saville
1c1827a640 am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit '3f4867f49d6c1932117e3519ce10d11f37829f19':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:20:02 +00:00
Wink Saville
3f4867f49d Merge "Telephony: Add functionality to handle ICC IO error" 2014-04-25 23:58:11 +00:00
Mark Salyzyn
dfdeabf9ba am ac732708: Merge "EventLog: event log translation errors" 
* commit 'ac7327082c411617f7937b87575c117bd63ad9df':
  EventLog: event log translation errors
 2014-04-25 22:03:20 +00:00
Mark Salyzyn
ac7327082c Merge "EventLog: event log translation errors" 2014-04-25 21:59:19 +00:00
Mark Salyzyn
747802f8aa EventLog: event log translation errors 
- Deal with L using v3 event log format, or K using v1 or v2 event log format

Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
 2014-04-25 13:45:03 -07:00
Marco Nelissen
eded9e3b7f am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'adcf38c9936fa372309d413cec03a1413e797c7a':
  Release DrmManagerClient resources
 2014-04-25 14:46:35 +00:00
Marco Nelissen
adcf38c993 Merge "Release DrmManagerClient resources" 2014-04-25 14:42:02 +00:00
Lu, Shenghua
ea42e01527 libhwui: Handle the blurImage() implement once RS::init fail 
Once the RS::init failed, go through the original single thread path,
this will avoid blocking the main thread(ANR), but we also should have
some implement in RenderScript component.

Change-Id: I3a21395ffd5bc144c15254893f425b1dd2643ba4
Signed-off-by: Shenghua Lu <shenghua.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
 2014-04-25 16:11:13 +08:00
Selim Gurun
e3fc307382 am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit '8c2d70f5e8dfe64213f44c29562fe4240779b68b':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:12:46 +00:00
Selim Gurun
8c2d70f5e8 Merge "Add a stub for forgotten callback to fix master-gpl." 2014-04-25 01:08:48 +00:00
Selim Gurun
4e48f40b03 Add a stub for forgotten callback to fix master-gpl. 
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
 2014-04-24 18:04:04 -07:00
Selim Gurun
f7a191731f am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'adad989b6a2c736f427526e747dcb89ed9762bab':
  Add a stub to fix master-gpl
 2014-04-25 00:41:59 +00:00
Selim Gurun
adad989b6a Merge "Add a stub to fix master-gpl" 2014-04-25 00:39:10 +00:00
Selim Gurun
85b89bf7a3 Add a stub to fix master-gpl 
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
 2014-04-24 17:31:07 -07:00
Elliott Hughes
5f5ca3bc98 am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '31a1dd2a8f56b439861ee335b55f44323318830c':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:55:09 +00:00
Elliott Hughes
31a1dd2a8f Merge "Use the suggested public API instead of libcore.os." 2014-04-24 23:52:16 +00:00
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os. 
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
 2014-04-24 16:19:27 -07:00
Mark Salyzyn
eacaa353e8 am c717179e: Merge "jni: android_util_Process 64 bit issues" 
* commit 'c717179e4fec346334fe4bb8603184499b746179':
  jni: android_util_Process 64 bit issues
 2014-04-24 22:14:02 +00:00
Mark Salyzyn
c717179e4f Merge "jni: android_util_Process 64 bit issues" 2014-04-24 22:10:22 +00:00
Mark Salyzyn
c6a410164e jni: android_util_Process 64 bit issues 
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing

Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
 2014-04-24 13:09:15 -07:00