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

159221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
f9f4195170 am ee435b16: Merge "telephony: Update comments for preferred network mode" 
* commit 'ee435b16d89ee9cb65eead9ac7507693342c15b3':
  telephony: Update comments for preferred network mode
 2014-12-26 18:53:55 +00:00
Elliott Hughes
ee435b16d8 Merge "telephony: Update comments for preferred network mode" 2014-12-26 18:48:57 +00:00
Sungmin Choi
e099ab18e6 telephony: Update comments for preferred network mode 
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
 2014-12-25 07:39:37 +00:00
Nick Kralevich
8454f2d485 am 5e1e38cc: Merge "Mods to the SELinuxMMAC engine code." 
* commit '5e1e38ccdd3da34f65a642dc25b5b2b5cf2b6059':
  Mods to the SELinuxMMAC engine code.
 2014-12-23 19:46:44 +00:00
Nick Kralevich
5e1e38ccdd Merge "Mods to the SELinuxMMAC engine code." 2014-12-23 19:42:06 +00:00
Robert Craig
2e1f052f45 Mods to the SELinuxMMAC engine code. 
* We now require that all certs used to sign the apk and all
  certs stored with policy be tested for set equality. Prior
  efforts required that the cert included with policy only
  needed to match one of the certs included with an apk.

* Allowed a new tag to be included with policy describing the
  signatures. <cert signature=""/> is now allowed as a child
  element of the <signer> tag describing multiple certs. The
  old way of describing signatures attached as attributes to
  the root signer tag is still supported. The engine now treats
  it the same as if they used the new layout with the outer
  signature as the first signature value.

* Moved the class which holds all policy from an inner static
  to a builder pattern governed by the Policy.PolicyBuilder
  class. This will help provide more clarity and allow for
  easier enforcement of certain invariants as the policy
  representation is being built.

* Loads of new comments.

Change-Id: I38eb00ed8962fdef71bc9f2e7370cb910cadeff4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-12-23 18:30:31 +00:00
Narayan Kamath
4dcc8d28d7 am d7771768: Merge "Build against libphonenumber-platform." 
* commit 'd777176872792ed2a17f46acbd2f8ebc64ac1995':
  Build against libphonenumber-platform.
 2014-12-23 13:41:17 +00:00
Narayan Kamath
d777176872 Merge "Build against libphonenumber-platform." 2014-12-23 13:33:45 +00:00
Andreas Gampe
5470c16991 am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 
* commit '2b20efa728f79ef9322930aefbbf0483a578ee74':
  Core/jni: Remove Dalvik options from AndroidRuntime
 2014-12-23 03:37:07 +00:00
Andreas Gampe
2b20efa728 Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 2014-12-23 03:29:46 +00:00
Andreas Gampe
08b2d585b1 Core/jni: Remove Dalvik options from AndroidRuntime 
Dalvik is dead. Remove old command-line options from AndroidRuntime.

Bug: 18833580
Bug: 18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
 2014-12-22 14:57:18 -08:00
Olawale Ogunwale
796a177307 am 4fa039df: Merge "Layout the config-changed window if it has surface" 
* commit '4fa039dfb1a5a23dad493f3c8c2c7529ecc1e96d':
  Layout the config-changed window if it has surface
 2014-12-19 15:37:11 +00:00
Olawale Ogunwale
4fa039dfb1 Merge "Layout the config-changed window if it has surface" 2014-12-19 15:30:39 +00:00
Craig Mautner
c14a4b10ca Merge "Fix racing condition of mTouchExcludeRegion" 
automerge: 6007d9a

* commit '6007d9aa5f53685bba47ee63d6b4702b9f802744':
  Fix racing condition of mTouchExcludeRegion
 2014-12-19 06:44:30 +00:00
Craig Mautner
6007d9aa5f Merge "Fix racing condition of mTouchExcludeRegion" 2014-12-19 06:41:27 +00:00
tingna_sung
33d8e73920 Fix racing condition of mTouchExcludeRegion 
Copy region from DisplayContent.mTouchExcludeRegion instead of
directly refer to the same object of DisplayContent, and able to
protect it by lock of self class, don't have to lock out mWindowMap
on every tap.

This fix is to avoid racing condition of mTouchExcludeRegion.

Change-Id: I7401968167c2e539b4da2afe71e3020038fbfcbf
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-12-19 13:21:08 +08:00
tiger_huang
f73883f69d Layout the config-changed window if it has surface 
This patch fixes an issue which caused the resumed app to get the
wrong frame at first.

https://code.google.com/p/android/issues/detail?id=82242

Change-Id: I4483029326afca143e7921f3b9563da4f566d2e5
 2014-12-19 13:19:36 +08:00
Jeff Hao
51bdc629f5 am e06184e4: Merge "Add mips64 support to app_process." 
* commit 'e06184e4b1f2228f404a3346b7355219b437c28a':
  Add mips64 support to app_process.
 2014-12-18 20:25:39 +00:00
Jeff Hao
e06184e4b1 Merge "Add mips64 support to app_process." 2014-12-18 19:18:54 +00:00
Alex Klyubin
e48aec9e7f am ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes." 
* commit 'ff35642e4732771a275e0ba8147af4a5d77f8419':
  Remove DefaultHostnameVerifier from preloaded-classes.
 2014-12-18 17:45:35 +00:00
Alex Klyubin
ff35642e47 Merge "Remove DefaultHostnameVerifier from preloaded-classes." 2014-12-18 17:40:46 +00:00
Olawale Ogunwale
5cb6837f28 am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 
* commit '07bb03c42343d54d0a8eb609c74eebd9ecd0df9d':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.
 2014-12-18 17:00:07 +00:00
Elliott Hughes
e37f3af76d am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." 
* commit '5cd79d070828b79d8b7d4ecdc3bdbf862866ac9a':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 17:00:01 +00:00
Olawale Ogunwale
07bb03c423 Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 2014-12-18 16:55:43 +00:00
Elliott Hughes
5cd79d0708 Merge "Move the remaining ZygoteInit native code over to Java." 2014-12-18 16:55:23 +00:00
Narayan Kamath
ddd11793a2 Build against libphonenumber-platform. 
Don't compile libphonenumber sources directly.

Change-Id: Ib2efd84535a2cffe773271fd1ddcb66a6a651cb8
 2014-12-18 13:26:03 +00:00
Douglas Leung
7e7c603182 Add mips64 support to app_process. 
Change-Id: Ieb05a212606f02ebad119a0aea0ed92773ace214
 2014-12-17 20:27:25 -08:00
Elliott Hughes
ba6982a16c am 93241de7: Merge "Remove a bitrotted test." 
* commit '93241de734c3b9cf20e8e8956e6f6ccacc5b5ef2':
  Remove a bitrotted test.
 2014-12-18 00:37:51 +00:00
Elliott Hughes
93241de734 Merge "Remove a bitrotted test." 2014-12-18 00:32:01 +00:00
Elliott Hughes
988fd73499 Remove a bitrotted test. 
Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
 2014-12-17 16:29:04 -08:00
Olawale Ogunwale
fd7819dbe0 am f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe" 
* commit 'f62877d305d2da4876707137cefe0eaa1b2953c3':
  Prevent wrong system ui visibility callback after the user swipe
 2014-12-17 21:47:45 +00:00
Olawale Ogunwale
e3b07b4856 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" 
* commit '486a9942ebc6e3efe04004afd759a53ab96517ec':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:47:38 +00:00
Olawale Ogunwale
f62877d305 Merge "Prevent wrong system ui visibility callback after the user swipe" 2014-12-17 21:43:27 +00:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Elliott Hughes
26b56e628b Move the remaining ZygoteInit native code over to Java. 
Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
 2014-12-17 12:28:29 -08:00
Elliott Hughes
a1beb930f5 am e6d63b94: Merge "Rewrite selectReadable JNI in Java." 
* commit 'e6d63b94627d0072ff1468feca71698df1a0b64e':
  Rewrite selectReadable JNI in Java.
 2014-12-17 18:26:33 +00:00
Elliott Hughes
e6d63b9462 Merge "Rewrite selectReadable JNI in Java." 2014-12-17 18:21:06 +00:00
Narayan Kamath
681e6df122 am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API." 
* commit '6d41504d2c2111a55a4c06dd6b183318efd7c598':
  Move frameworks users over to libcore hex encoding API.
 2014-12-17 13:39:32 +00:00
Narayan Kamath
6d41504d2c Merge "Move frameworks users over to libcore hex encoding API." 2014-12-17 13:34:00 +00:00
Tim Murray
68a81bd881 am 8de16999: Merge "Fix typo with register native allocation." 
* commit '8de169993f0078bfdd064499c48b9d124cb438be':
  Fix typo with register native allocation.
 2014-12-16 21:36:43 +00:00
Tim Murray
8de169993f Merge "Fix typo with register native allocation." 2014-12-16 21:30:58 +00:00
Ying Wang
49b2f00acf am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
* commit 'c80c12dda9c1ce11affdccb2923b2e570daacfcd':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:50:58 +00:00
Ying Wang
c80c12dda9 Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 2014-12-16 20:46:17 +00:00
Ying Wang
34db51cdd7 Cleanup Obsolete LOCAL_PRELINK_MODULE. 
Bug: 18675947
Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
 2014-12-16 12:45:49 -08:00
Elliott Hughes
894724be30 Rewrite selectReadable JNI in Java. 
Bug: 18719692
Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438
 2014-12-16 10:00:33 -08:00
Tim Murray
d11a658db1 Fix typo with register native allocation. 
bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808
 2014-12-16 09:59:09 -08:00
Narayan Kamath
78108a3e52 Move frameworks users over to libcore hex encoding API. 
Removes dependency on apache-http.

bug: 18027885
Change-Id: I508db016747985ecdd68e02d5d4efcd0ddd694df
 2014-12-16 17:25:07 +00:00
mark_chen
89764e337b [ActivityManager] Use synchronized to protect object 
Symptom: ArrayIndexOutOfBoundsException at mResourcePackages
Root Cause: Race condition issue
Solution: Use synchronized to protect object

Change-Id: Ia2d89d50919d95d95f6f8ac2eb75594a93e8f2da
 2014-12-16 05:44:34 +00:00
Christopher Tate
15626d3a49 am b32a33ce: Merge "Turn debug flag off" 
* commit 'b32a33cec1bf54ba3fc243c1fbab59a98506c0ef':
  Turn debug flag off
 2014-12-16 03:03:11 +00:00
Christopher Tate
b32a33cec1 Merge "Turn debug flag off" 2014-12-16 02:53:13 +00:00