summaryrefslogtreecommitdiffstats
path: root/rootdir
Commit message (Collapse)AuthorAgeFilesLines
* am 2aa33a3d: Add writable data space for radio.Robert Greenwalt2013-07-191-0/+1
|\ | | | | | | | | * commit '2aa33a3dbd1147558098d9a2948450d363ffe468': Add writable data space for radio.
| * Add writable data space for radio.Robert Greenwalt2013-07-161-0/+1
| | | | | | | | | | | | | | | | Storing carrier provisioning urls updates in /data/misc/radio. bug:9623159 Change-Id: I8d62d4638229733dea0f11f1729c4d22ae2295d1 I36697ed341353b7a3dbec5afe20241102e76f6f1
* | init.rc: remove "on fs" sectionNick Kralevich2013-07-121-8/+0
| | | | | | | | | | | | | | This was only ever used by the emulator. Now the emulator uses an fstab file. Change-Id: I1a071e567e1f1a379f9c8079cc2dc17660d8455f
* | am fb1c9cf6: Merge "use ext4 instead of yaffs"Nick Kralevich2013-07-121-4/+4
|\ \ | | | | | | | | | | | | * commit 'fb1c9cf6fa4efafb3e0c6b0bc93c7f087d926a48': use ext4 instead of yaffs
| * | use ext4 instead of yaffsNick Kralevich2013-07-091-4/+4
| | | | | | | | | | | | | | | | | | | | | This is needed to allow the emulator to use ext4 images. Bug: https://code.google.com/p/android/issues/detail?id=38561 Change-Id: I02fde6382ad67cf7f4f3b695396841f70bb9301d
| * | Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by ↵Colin Cross2013-07-031-0/+1
| |\ \ | | | | | | | | | | | | default."
| | * | Added net.dns1 prop for emulator, as Android emulator ignores it by default.Ron Munitz2013-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit sets up the system property which is actually used by the Connectivity Service (frameworks/base/services/java/com/android/server/ConnectivityService.java). It fixes an (obsolete?) convention where the dns was affected directly by the interface (i.e. "net.eth0.dns1=10.0.2.3"), which causes the Android Emulator (goldfish) to ignore this value, and effectively have no DNS resolving at all. An immediate fix can be either add reference to net.eth%s.dns%s in the ConnectivityService and possibly on the dhcp code as well which would be bloated, or just stick to the apparant new convention. I chose the latter as a one line fix which gets the job done. Change-Id: Id4364129e9a82c1f48403068a837aca54de07944
* | | | am 3d8e8c14: am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"Colin Cross2013-05-201-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '3d8e8c147b41dbc6a5e4edf6da1610a83623b5b2': init.rc: remove duplicated led-related nodes
| * \ \ \ am 9246f8d6: Merge "init.rc: remove duplicated led-related nodes"Colin Cross2013-05-201-6/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9246f8d6def40a50933a980fac773a909f2138d7': init.rc: remove duplicated led-related nodes
| | * | | init.rc: remove duplicated led-related nodesSungmin Choi2013-05-191-6/+0
| | |/ / | | | | | | | | | | | | Change-Id: Ibee7ef9137594fc4c30d3ab6ee7bdf3515836c62
* | | | am 477e35d6: Revert "Add persistent property for SELinux enforcment status."gcondra@google.com2013-05-201-6/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '477e35d6d56c7fe9b2305becdf3ed4f590ddfbd6': Revert "Add persistent property for SELinux enforcment status."
| * | | Revert "Add persistent property for SELinux enforcment status."repo sync2013-05-171-6/+0
| | | | | | | | | | | | | | | | This reverts commit b89bdfde422eff751b3f939f10ab57e22af83eaa.
* | | | am 8a387870: Revert "Reload policy after setting up the data partition."gcondra@google.com2013-05-201-4/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8a3878700eb9cd8ecf495cd01f15face5c3879c8': Revert "Reload policy after setting up the data partition."
| * | | Revert "Reload policy after setting up the data partition."repo sync2013-05-171-4/+0
| | | | | | | | | | | | | | | | This reverts commit fee250d27a9c03af1ba439047b976d89563b1887.
* | | | am 52351300: Revert "Add a version check for SELinux policy on device."gcondra@google.com2013-05-201-3/+3
|\ \ \ \ | |/ / / | | / / | |/ / |/| | * commit '52351300d156826bf22c493828571f45a1cea16a': Revert "Add a version check for SELinux policy on device."
| * | Revert "Add a version check for SELinux policy on device."repo sync2013-05-171-3/+3
| | | | | | | | | | | | This reverts commit 921be8b6568df0057c4eacbac2e1022b71e09620.
* | | am 921be8b6: Add a version check for SELinux policy on device.gcondra@google.com2013-05-141-3/+3
|\ \ \ | |/ / | | | | | | | | | * commit '921be8b6568df0057c4eacbac2e1022b71e09620': Add a version check for SELinux policy on device.
| * | Add a version check for SELinux policy on device.repo sync2013-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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 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 fee250d2: Reload policy after setting up the data partition.gcondra@google.com2013-04-301-0/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit 'fee250d27a9c03af1ba439047b976d89563b1887': Reload policy after setting up the data partition.
| * | | Reload policy after setting up the data partition.repo sync2013-04-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aospKenny Root2013-04-291-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: If41560f0fef3103cad2172061a7988ceb5556377
| * | | Track change to JSSE providerKenny Root2013-04-291-1/+1
| | |/ | |/| | | | | | | Change-Id: Iff9103fff3591983f2b172f83fd2a6e924986aa7
| * | Merge "rootdir: goldfish: mount debugfs on boot time"Keun-young Park2013-04-051-0/+1
| |\ \
| | * | rootdir: goldfish: mount debugfs on boot timeYoung-Ho Cha2013-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | goldfish is ported to linux-3.4 and have capability to run atrace. But can't run atrace yet because debugfs is not mounted on boot time. Change-Id: I0ce23bde3b8d1b2a88d4238272123e3ab8cb6970 Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
* | | | am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." ↵gcondra@google.com2013-04-261-0/+6
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '538b5d4e8e4c480b2120aa957fe3e11a2836a1b3': Add persistent property for SELinux enforcment status.
| * | | Merge "Add persistent property for SELinux enforcment status." into jb-mr2-devrepo sync2013-04-261-0/+6
| |\ \ \
| | * | | Add persistent property for SELinux enforcment status.repo sync2013-04-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds triggers for going between enforcing and permissive status. Bug: 8702843 Change-Id: I841d80999b96acf6b6fd0a5408fb074952d6ae72
* | | | | am 131ee07b: Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-devJeff Tinker2013-04-241-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '131ee07b77e0250c16cebe2b0e226c5bff8e9587': Add a new group for MediaDrm engine plugins
| * | | | Merge "Add a new group for MediaDrm engine plugins" into jb-mr2-devJeff Tinker2013-04-251-1/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add a new group for MediaDrm engine pluginsJeff Tinker2013-04-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 8702754 Change-Id: I3b7988b64b1dcf4685624e4c1af938e132b82696
* | | | | am 7ee2e26e: Remove DBUS from make and header filesMatthew Xie2013-04-242-28/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7ee2e26eb98da10eaddf5a8e864d508cceab946b': Remove DBUS from make and header files
| * | | | Remove DBUS from make and header filesMatthew Xie2013-04-232-28/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | DBUS had been needed by bluetooth bluz stack. It is not needed after we replaced bluez stack with bluedroid stack. bug 6872904 Change-Id: I3fa41c1dd4ac80bc679d5950b3b20c7f6d12265f
* | | | Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" ↵Brian Carlstrom2013-04-031-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | into jb-mr2-dev-plus-aosp
| * | | resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aospBrian Carlstrom2013-04-031-1/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I63d6a2f975a6c0df5c238a2f7592f357441eb767
| | * | Add OkHttp to the boot classpath.jwilson2013-04-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I185b803b5b804ff8680ef928ce5163727adbf0bd
* | | | Give system ownership of selinux load and enforce files.Geremy Condra2013-04-031-0/+4
|/ / / | | | | | | | | | | | | | | | This is necessary to enable remote updates. Change-Id: I05fb979c0360eca4cc6e4add48bb42f712a1ba17
* | | init.rc: Set owner/perm for interactive governor io_is_busyTodd Poynor2013-03-251-0/+2
| | | | | | | | | | | | Change-Id: I7537d56a23ca787daf92a9d91778056f987097bd
* | | am 4d71493e: am e849970c: Merge "Fix mode on /data/security."Geremy Condra2013-03-221-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '4d71493e74ed1ea39e554146351cc39e47cb5d02': Fix mode on /data/security.
| * | Fix mode on /data/security.Stephen Smalley2013-03-211-1/+1
| | | | | | | | | | | | | | | Change-Id: Id97d06a1c360c7871361db147f76b8a2eaceca42 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
| * | Create a new location for /data policy filesWilliam Roberts2013-03-201-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | Adding a new location for policy files under /data, the new location is /data/security. The new location is used before attempting to use any other location. This requires a new directory to be created by the init script and an update to the location of the property_contexts file for property service. Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
* | Create a new location for /data policy filesWilliam Roberts2013-03-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Adding a new location for policy files under /data, the new location is /data/security. The new location is used before attempting to use any other location. This requires a new directory to be created by the init script and an update to the location of the property_contexts file for property service. Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
* | Add symlink to bugreport storage location.Jeff Sharkey2013-03-141-0/+3
| | | | | | | | Change-Id: I16f024c24767cfa1f5800d568d39fb098a408127
* | move goldfish stuffs to device/generic/goldfishKeun young Park2013-03-055-212/+0
| | | | | | | | | | | | - each files will be pulled in emulator.mk as PRODUCT_COPY_FILES Change-Id: I4772e2fd863e6d2663f477c3acd8a90cb95b498a
* | Merge "Add directory for mediaserver"Glenn Kasten2013-02-231-0/+1
|\ \
| * | Add directory for mediaserverGlenn Kasten2013-02-221-0/+1
| | | | | | | | | | | | | | | Bug: 8223560 Change-Id: Iccc6d439a848445cac0f5b30d1d663aed3f5344e
* | | am c5ce4108: am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"Nick Kralevich2013-02-221-0/+1
|\ \ \ | |/ / |/| / | |/ | | * commit 'c5ce4108facc5a1b94fcf9469a189b2cbdfd5e76': init.rc: allow IPPROTO_ICMP support
| * init.rc: allow IPPROTO_ICMP supportNick Kralevich2013-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow userspace programs to create IPPROTO_ICMP sockets. This socket type allows an unprivileged program to safely send ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages, without relying on raw sockets or setuid programs. Please see http://lwn.net/Articles/443051/ for details. In particular, this allows us to use a version of ping which doesn't have any capabilities (https://android-review.googlesource.com/52072). In addition, this allows us to safely implement an IPv4 ICMP based version of InetAddress.isReachable() (https://code.google.com/p/android/issues/detail?id=20106) Change-Id: I876718151efa8219c4f34f573e35e21256fe2316