summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | am 19ec15b2: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * commit '19ec15b247523ec8b0c6651e01bf746674d424d1':
| * | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Change-Id: I731b1db7da9f82dbb92a3e1dc40bfab1a3f307e2
| | * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-150-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-080-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-010-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-290-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-250-0/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-220-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-170-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-160-0/+0
| | | | | | | | | |\ \ \ \
* | | | | | | | | | \ \ \ \ am 3ce15fcc: am de1dadb7: Merge "Disable darwin build"Brian Carlstrom2013-05-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ce15fcc916e097b6a98efc57302e012dab69d6f': Disable darwin build
| * | | | | | | | | | | | | am de1dadb7: Merge "Disable darwin build"Brian Carlstrom2013-05-151-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de1dadb73903a3b8d080ed6d2b5e916fe9654fc4': Disable darwin build
| | * | | | | | | | | | | | Merge "Disable darwin build"Brian Carlstrom2013-05-151-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Disable darwin buildBrian Carlstrom2013-05-151-1/+3
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie72bbaab8604cdc14082859b735458a2f73c3074
* | | | | | | | | | | | | | am 5a98566d: am 921be8b6: Add a version check for SELinux policy on device.gcondra@google.com2013-05-142-3/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a98566d589408c78e35f4476f478a2fa1c13e78': Add a version check for SELinux policy on device.
| * | | | | | | | | | | | | am 921be8b6: Add a version check for SELinux policy on device.gcondra@google.com2013-05-142-3/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '921be8b6568df0057c4eacbac2e1022b71e09620': Add a version check for SELinux policy on device.
| | * | | | | | | | | | | | Add a version check for SELinux policy on device.repo sync2013-05-142-3/+62
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps to ensure that when a new system image is installed, old userdata policy isn't applied over the top of it. Bug: 8841348 Change-Id: I135af32250aa62979763e775842ce0af3c8b6f9f
* | | | | | | | | | | | | am a817ff9c: resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aospBrian Carlstrom2013-05-149-44/+188
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a817ff9cf61daeb69e8b8382c80677e3e5c573a9': Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list(). Add basic Darwin support to libcorkscrew.
| * | | | | | | | | | | | resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aospBrian Carlstrom2013-05-149-44/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf344a1fc7e2f8ec76232ae14a00298ddd322a55
| | * | | | | | | | | | | Merge changes I5578fe06,I197b06c4Brian Carlstrom2013-05-159-44/+188
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list(). Add basic Darwin support to libcorkscrew.
| | | * | | | | | | | | | | Add flush_my_map_info_list() and fix a bug in the Mac load_map_info_list().Elliott Hughes2013-05-143-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (If you fclose(3) rather than pclose(3) a FILE* you got from popen(3), future popen(3)s fail obscurely, at least on Mac OS.) (cherry picked from commit 2bf76e143da933184d1392fb9bea3a3896c37e76) Change-Id: I5578fe06753061b0dbc5ee951ebf31eb2bab0389
| | | * | | | | | | | | | | Add basic Darwin support to libcorkscrew.Elliott Hughes2013-05-148-41/+164
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This might not seem like much, but it's already better than Mac OS' backtrace(3). (cherry picked from commit 2a46f6293f19b9d6100187fbd53088088e671b88) Change-Id: I197b06c4c19f728ad6f194b2f473bd9dcd99b8a6
* | | | | | | | | | | | | surfaceflinger is now always running in its own processMathias Agopian2013-05-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ae63347a8b6d406306ed894665674dd726b7d51
* | | | | | | | | | | | | am ac5cf925: am 683aa89b: Merge "Remove /system from the dirs to relabel." ↵gcondra@google.com2013-05-081-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'ac5cf925f86706d2bf89948e7cd3379376185d3b': Remove /system from the dirs to relabel.
| * | | | | | | | | | | | am 683aa89b: Merge "Remove /system from the dirs to relabel." into jb-mr2-devgcondra@google.com2013-05-071-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '683aa89bfdf2439d1c5d9a4dc240d6a673678a98': Remove /system from the dirs to relabel.
| | * | | | | | | | | | | Merge "Remove /system from the dirs to relabel." into jb-mr2-devrepo sync2013-05-081-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Remove /system from the dirs to relabel.repo sync2013-05-071-1/+0
| | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8841348 Change-Id: Ia1545288e8a8184feffaaa6158faad62f95cbcce
* | | | | | | | | | | | | am 6e46a3b8: am a1ee12ca: Merge "libcutils: add a trace tag for Dalvik" into ↵Jamie Gennis2013-05-081-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '6e46a3b8e64a7a2ca4754ed7b1f9922719bd0a9b': libcutils: add a trace tag for Dalvik
| * | | | | | | | | | | | am a1ee12ca: Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-devJamie Gennis2013-05-071-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1ee12ca3a0ec44bb8a3eb917d13c0b5178075d9': libcutils: add a trace tag for Dalvik
| | * | | | | | | | | | | Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-devJamie Gennis2013-05-081-1/+16
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | libcutils: add a trace tag for DalvikJamie Gennis2013-05-071-1/+16
| | | | |_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a trace tag bit for Dalvik. It also allows the ATRACE_* macros to be called from code compiled for the host with no effect. Bug: 8856374 Change-Id: I9c17129d6cc170cae00b6500485b5b5fa4b5e647
* | | | | | | | | | | | Merge "cutils: first pass at cleaning up legacy/obsolete code in cutils"Dima Zavin2013-05-0817-3356/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cutils: first pass at cleaning up legacy/obsolete code in cutilsDima Zavin2013-05-0717-3356/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused code and moved libraries with single clients near their respective users. Change-Id: I65f90f8659f27bd0f44ca5ddf33da2bce14674c1 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | | | | | | | | | am 6119cffa: am 7382459e: Merge "Host builds: add fastboot and adb"Ying Wang2013-05-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | | | | | | | | | | | | * commit '6119cffa63d1b5d49c23a25353fc40ad0d99f82e': Host builds: add fastboot and adb
| * | | | | | | | | | | am 7382459e: Merge "Host builds: add fastboot and adb"Ying Wang2013-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7382459eca9632168b9d393bc77fb62bc21bb67a': Host builds: add fastboot and adb
| | * | | | | | | | | | Merge "Host builds: add fastboot and adb"Ying Wang2013-05-022-0/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Host builds: add fastboot and adbKenny Root2013-05-022-0/+2
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fastboot and adb host utilities to debug builds for debugging and development purposes. Change-Id: If77699a27497b8641998930f14d4ee418b856080
* | | | | | | | | | | | am cb4b9605: am 8794b2ee: Merge "Fix perms on /data/security"Colin Cross2013-04-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb4b9605cb923d071a546b444d10cbe21367d878': Fix perms on /data/security
| * | | | | | | | | | | am 8794b2ee: Merge "Fix perms on /data/security"Colin Cross2013-04-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8794b2eeb2bbd717ca18b8bef5d853f99334aabc': Fix perms on /data/security
| | * | | | | | | | | | Merge "Fix perms on /data/security"Colin Cross2013-05-011-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix perms on /data/securityWilliam Roberts2013-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installd and zygote need to be able to search the directory to access the policy files. Change-Id: I0679fd2084d2664dfb5a594f493317eff058415d
* | | | | | | | | | | | | am 803eda6a: am f69cc564: Merge "Update ueventd set the SELinux context on ↵Colin Cross2013-04-301-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sysfs" * commit '803eda6a2dfcb50f61dd4a6a616e560a87453cb0': Update ueventd set the SELinux context on sysfs
| * | | | | | | | | | | | am f69cc564: Merge "Update ueventd set the SELinux context on sysfs"Colin Cross2013-04-301-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f69cc564f4129ad7f223bb7d83ebec9fe3438b62': Update ueventd set the SELinux context on sysfs
| | * | | | | | | | | | | Merge "Update ueventd set the SELinux context on sysfs"Colin Cross2013-05-011-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Update ueventd set the SELinux context on sysfsStephen Smalley2013-04-031-0/+9
| | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables labeling of dynamically created sysfs nodes with specific SELinux security contexts. Change-Id: If8b8d66120453123c1371ce063b6f20e8b96b6ef Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | | | | | | | | am 55d69a96: am 032be7a4: Merge "Log an error if property pool is exhausted"Colin Cross2013-04-301-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55d69a9681061b97d6bdcc0b1b92a7de63d0a07b': Log an error if property pool is exhausted
| * | | | | | | | | | | | am 032be7a4: Merge "Log an error if property pool is exhausted"Colin Cross2013-04-301-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '032be7a4c5be8c015063084d162d1f394279aa3d': Log an error if property pool is exhausted
| | * | | | | | | | | | | Merge "Log an error if property pool is exhausted"Colin Cross2013-05-011-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Log an error if property pool is exhaustedJohan Redestig2013-04-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failing to set properties due to an exhausted pool leads to difficult to debug problems. This change adds an error log to make the situation a bit easier to handle. Change-Id: Icc1d97a80882fb23e74428a0195f1d28dba68fa8
* | | | | | | | | | | | | | am 63577d92: am fee250d2: Reload policy after setting up the data partition.gcondra@google.com2013-04-305-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '63577d9280e7919bfb7221030d211b833e66bb1e': Reload policy after setting up the data partition.
generated by cgit v1.1 at 2025-10-26 13:01:52 +0000