summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-mr2-zeroday-release history after reset to jb-mr2-devandroid-4.3_r2The Android Automerger2013-06-160-0/+0
|\
| * merge in jb-mr2-release history after reset to jb-mr2-devandroid-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9The Android Automerger2013-05-230-0/+0
| |\
| | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-210-0/+0
| | |\
| | | * 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
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-150-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-100-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-080-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-040-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-030-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-020-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-010-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-280-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-260-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-250-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-210-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-02-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add directory for mediaserverGlenn Kasten2013-02-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8223560 Change-Id: Iccc6d439a848445cac0f5b30d1d663aed3f5344e
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free file handle for /firmware/image after useAjay Dudani2013-06-131-0/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id59e25486b45dffc87a89a961970a6e8128a5237
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-devMatthew Xie2013-05-221-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add permission for bluetooth app in non-primary usersMatthew Xie2013-05-221-0/+8
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 8954114 Change-Id: Id6a42f5a5beefa22c3cc8eecfb39a2222017a3b4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Add logic to fixup file contexts after a policy update."repo sync2013-05-171-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ebcf93e3bf92bf46c54c8e0f2ec8936bb2db6aea.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Add persistent property for SELinux enforcment status."repo sync2013-05-172-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b89bdfde422eff751b3f939f10ab57e22af83eaa.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Reload policy after setting up the data partition."repo sync2013-05-175-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fee250d27a9c03af1ba439047b976d89563b1887.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove /system from the dirs to relabel."repo sync2013-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3d4d07b2fa3b2447646d3c87a0b401e993ad8363.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Add a version check for SELinux policy on device."repo sync2013-05-172-62/+3
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 921be8b6568df0057c4eacbac2e1022b71e09620.
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove /system from the dirs to relabel." into jb-mr2-devrepo sync2013-05-071-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove /system from the dirs to relabel.repo sync2013-05-071-1/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8841348 Change-Id: Ia1545288e8a8184feffaaa6158faad62f95cbcce
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libcutils: add a trace tag for Dalvik" into jb-mr2-devJamie Gennis2013-05-071-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
* | | | | | | | | | | | | | | | | | | | | | | | | | | Reload policy after setting up the data partition.repo sync2013-04-305-3/+13
| |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This forces a policy reload + fixcon to deal with dynamically delivered policy changing labels on device nodes. It's implemented as a new keyword in init. Bug: 8702843 Change-Id: I803cf1ecf6ff8318ce25dcc5cda4f292adc9738c
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add persistent property for SELinux enforcment status." into jb-mr2-devrepo sync2013-04-262-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Add persistent property for SELinux enforcment status.repo sync2013-04-252-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds triggers for going between enforcing and permissive status. Bug: 8702843 Change-Id: I841d80999b96acf6b6fd0a5408fb074952d6ae72
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-devJeff Tinker2013-04-242-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Add a new group for MediaDrm engine pluginsJeff Tinker2013-04-232-1/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 8702754 Change-Id: I3b7988b64b1dcf4685624e4c1af938e132b82696