Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,474 Commits 3 Branches 0 Tags
98fdff61dd651f52d36c0e88dcce8a04568b7cc7
Commit Graph

174474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
98fdff61dd am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 
* commit '56fde9e70ef850ca7e3f076e52567f5c75b5e7da':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
 2015-03-03 17:02:22 +00:00
Nick Kralevich
56fde9e70e Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 2015-03-03 16:55:10 +00:00
Selim Gurun
545093df16 am 75666e90: Merge "Revert "Add potential future APIs for postmessage"" 
* commit '75666e9054d97a9daecd5648f71414406413c6d9':
  Revert "Add potential future APIs for postmessage"
 2015-03-03 02:20:57 +00:00
Selim Gurun
75666e9054 Merge "Revert "Add potential future APIs for postmessage"" 2015-03-03 02:14:19 +00:00
Selim Gurun
49f9ad8e2a Revert "Add potential future APIs for postmessage" 
This reverts commit 37bd8907cb.

Change-Id: Iaa9356b95859846ce9c3209d3d1bcfc800d2ff93
 2015-03-03 01:54:25 +00:00
Miao Wang
411473de4a am caa8a8fb: Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()." 
* commit 'caa8a8fb9849f1d44ffab3117950ac1e7b02cd4d':
  [Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom().
 2015-03-03 01:11:18 +00:00
Miao Wang
caa8a8fb98 Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()." 2015-03-03 00:57:48 +00:00
Jason Sams
9fc6948b61 am 514e0801: Merge "Fix crash when updating adapter offsets." 
* commit '514e0801cc95c9827d220104317e1fe45f396b94':
  Fix crash when updating adapter offsets.
 2015-03-03 00:03:58 +00:00
Jason Sams
514e0801cc Merge "Fix crash when updating adapter offsets." 2015-03-02 23:57:12 +00:00
Selim Gurun
aef983562a am 9fc8356b: Merge "Add potential future APIs for postmessage" 
* commit '9fc8356baa7816a13e0c140788ccf67301cbd28d':
  Add potential future APIs for postmessage
 2015-03-02 23:07:36 +00:00
Selim Gurun
9fc8356baa Merge "Add potential future APIs for postmessage" 2015-03-02 23:02:11 +00:00
Selim Gurun
37bd8907cb Add potential future APIs for postmessage 
Bug: 10237116

The APIs are hidden while work is ongoing.

Change-Id: I3e2f06d6e41af276171b127f06bdd74924c2e74c
 2015-03-02 14:53:01 -08:00
Stephen Smalley
e9dc17233f SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates. 
The current SELinuxPolicyInstallReceiver logic can yield a partial
or mixed (old and new) set of policy files under /data/security/current
if there is an error or a crash at certain points before completing
the installation of the update.

Rewrite the logic to avoid the possibility of such partial or mixed
policy updates by using rename on the entire directory of policy
files rather than operating on a per-file basis.  Also separate
the extraction of the policy files from the bundle into their own
temporary directory.  Make sure we delete any previous temporary directory
or backup directory before using them for this update.  Drop the
use of a symlink for /data/security/current altogether; it provides
no benefit.

Change-Id: I564af01c2c3ca1531c216013b8724c7511f32de8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2015-02-27 16:07:55 -05:00
Mark Salyzyn
012c3b723a am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read" 
* commit 'a891d08dad829c9aacd29bd2c3b36debe3fc1cc3':
  jni: Add paranoia regarding android_logger_list_read
 2015-02-27 18:52:36 +00:00
Mark Salyzyn
a891d08dad Merge "jni: Add paranoia regarding android_logger_list_read" 2015-02-27 18:46:04 +00:00
Geoff Mendal
50b04190c9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:32:49 +00:00
Geoff Mendal
10b62bff6f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:32:30 +00:00
Geoff Mendal
3fdb4cc75e Import translations. DO NOT MERGE 
Change-Id: Id83bfa16ba15aaa1f901547117c114490f4035fa
Auto-generated-cl: translation import
 2015-02-26 16:28:53 -08:00
Geoff Mendal
b17653a6a8 Import translations. DO NOT MERGE 
Change-Id: I030ed9725292854138dabb8c6d9b67e5a7ef0aa6
Auto-generated-cl: translation import
 2015-02-26 16:26:53 -08:00
Geoff Mendal
428472a1e4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:20:51 +00:00
Geoff Mendal
f456898cb9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:20:27 +00:00
Geoff Mendal
db14d28944 Import translations. DO NOT MERGE 
Change-Id: I12dd7931cbe95c7dfb4c9c468e19a25bcd780324
Auto-generated-cl: translation import
 2015-02-26 16:18:09 -08:00
Geoff Mendal
c4f503fd77 Import translations. DO NOT MERGE 
Change-Id: I69d645539c36b3915e43eaa0d7b190bc6d559840
Auto-generated-cl: translation import
 2015-02-26 16:16:10 -08:00
Geoff Mendal
ee13d90c18 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:15:46 +00:00
Geoff Mendal
61379caf15 Import translations. DO NOT MERGE 
Change-Id: Idb623a7515bd47274efcd49cc7f9182296213202
Auto-generated-cl: translation import
 2015-02-26 16:14:09 -08:00
Geoff Mendal
791dcb9597 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:13:08 +00:00
Geoff Mendal
5277e14417 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:12:54 +00:00
Geoff Mendal
d0625cedca Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:12:32 +00:00
Geoff Mendal
46c5d0b157 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:11:53 +00:00
Geoff Mendal
f24cf43727 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:11:01 +00:00
Geoff Mendal
d307a122ae Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:10:11 +00:00
Geoff Mendal
40f6a22b6e Import translations. DO NOT MERGE 
Change-Id: I1a8de3ff34e0661702038b8f006f920c5ca3ba27
Auto-generated-cl: translation import
 2015-02-26 16:08:40 -08:00
Geoff Mendal
57d73dbd34 Import translations. DO NOT MERGE 
Change-Id: I333284d756efb9b6f22577b047e95fde5a27ff71
Auto-generated-cl: translation import
 2015-02-26 16:04:59 -08:00
Geoff Mendal
f74ee77486 Import translations. DO NOT MERGE 
Change-Id: I59953f8c826f975cd602346307300d124b884a1c
Auto-generated-cl: translation import
 2015-02-26 16:02:59 -08:00
Geoff Mendal
5e8e930aec Import translations. DO NOT MERGE 
Change-Id: I893f1ac696506a8a96a1e447b3851ed3bf51c31c
Auto-generated-cl: translation import
 2015-02-26 15:59:12 -08:00
Geoff Mendal
413c7a9cca Import translations. DO NOT MERGE 
Change-Id: I5fb0da094aa109b970f333aea78b0366f2f5eb2c
Auto-generated-cl: translation import
 2015-02-26 15:57:08 -08:00
Geoff Mendal
1a61491215 Import translations. DO NOT MERGE 
Change-Id: I654168fbbcd5fe9371390f2d673561ce1e5c9c89
Auto-generated-cl: translation import
 2015-02-26 15:54:57 -08:00
Mark Salyzyn
ca50cd2114 jni: Add paranoia regarding android_logger_list_read 
Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22
 2015-02-26 14:49:17 -08:00
Geoff Mendal
70eb8077a2 Import translations. DO NOT MERGE 
Change-Id: Ic79aace8bc91318a1d637c834ae3176ee221bead
Auto-generated-cl: translation import
 2015-02-26 12:53:29 -08:00
Narayan Kamath
4d8caa5576 am 8cba382f: Merge "Bad month value in DatePicker in Calendar Mode" 
* commit '8cba382f04e4ead4a6b8c4a74216ddb383e8db91':
  Bad month value in DatePicker in Calendar Mode
 2015-02-26 17:49:19 +00:00
Narayan Kamath
8cba382f04 Merge "Bad month value in DatePicker in Calendar Mode" 2015-02-26 17:42:24 +00:00
You Kim
49e6c4adbf Bad month value in DatePicker in Calendar Mode 
Calendar MONTH field is zero based. Use predefined month.

Change-Id: I957bf385dc8e877e8698dacad68808f4d9d8a6d0
 2015-02-26 19:06:16 +09:00
Jason Sams
add04be7c8 Fix crash when updating adapter offsets. 
Change-Id: I0a6923e387f9743a06cc2c4c67995a79789d4cdd
 2015-02-25 16:42:00 -08:00
Miao Wang
c8e237e271 [Renderscript] JAVA API update for Allocation.CopyTo 
add the following functions to make it more symmetric to copyFrom().

  - copy1DRangeToUnchecked, copy1DRangeTo
  - copy2DRangeToUnchecked, copy2DRangeTo
  - copy3DRangeToUnchecked, copy3DRangeTo
  - setFromFieldPacker, 2D and 3D variants
  - copyElementTo, (1D, 2D & 3D)

Change-Id: I6b896123e1c00cead552aa5b31a701b15dd70f85
 2015-02-25 16:41:09 -08:00
Dan Albert
b7121d7030 am b78cce6f: Merge "Update autogenerated gl functions." 
* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
  Update autogenerated gl functions.
 2015-02-25 23:00:52 +00:00
Dan Albert
b78cce6f92 Merge "Update autogenerated gl functions." 2015-02-25 22:50:25 +00:00
Mark Salyzyn
533758c1fb am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags" 
* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags
 2015-02-25 19:13:12 +00:00
Mark Salyzyn
0d8b97a44e Merge "jni: switch to ANDROID_LOG_* mode flags" 2015-02-25 19:04:24 +00:00
Mark Salyzyn
18998c9852 jni: switch to ANDROID_LOG_* mode flags 
Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
 2015-02-25 18:07:21 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
 2015-02-24 12:56:52 +00:00