Commit graph

475 commits

Author SHA1 Message Date
The Android Automerger
405780e952 merge in master-release history after reset to b9f2c721d9 2014-04-28 05:49:03 -07:00
The Android Automerger
e3c050e848 merge in master-release history after reset to b9f2c721d9 2014-04-27 05:49:03 -07:00
The Android Automerger
8efe85e890 merge in master-release history after reset to b9f2c721d9 2014-04-26 05:49:03 -07:00
The Android Automerger
c3a8502a95 merge in master-release history after reset to b9f2c721d9 2014-04-24 05:49:03 -07:00
The Android Automerger
7b1aed2978 merge in master-release history after reset to master 2014-04-02 05:49:03 -07:00
Doug Zongker
b9f2c721d9 remove custom recovery UI for deb
All its functionality is now in the default UI.

Change-Id: Ic886dbaf239c899091ac637290c6207db0b02c74
2014-04-01 12:48:53 -07:00
Nick Kralevich
305d4e0e07 am eb47925d: Merge "Drop restorecons from init.deb.rc file."
* commit 'eb47925d3e3d2cee23b6907a12dcbbc2a68a02bc':
  Drop restorecons from init.deb.rc file.
2014-03-11 18:17:13 +00:00
Nick Kralevich
e34fa5ce5d am 538e8032: Merge "Add missing restorecon_recursive calls."
* commit '538e80320128b46eb27e8162c91128ec8c5104cc':
  Add missing restorecon_recursive calls.
2014-03-11 17:12:09 +00:00
Nick Kralevich
b29c7bda6b am 8816fbdd: Merge "Mount firmware partition as radio_efs_file."
* commit '8816fbdd1e4b6bd8e942c8545e37d37dc6a8357f':
  Mount firmware partition as radio_efs_file.
2014-03-11 00:38:45 +00:00
Nick Kralevich
2c0c4dce2e am c7c78b0c: Merge "Allow kickstart_checker.sh to run in system group."
* commit 'c7c78b0ce009dbfb04b4373d0b205c0e6fe296dc':
  Allow kickstart_checker.sh to run in system group.
2014-03-07 19:40:47 +00:00
Nick Kralevich
c9cf733779 am 05e07c20: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
* commit '05e07c20e3c861d0f189e12b850a831a45ded01e':
  Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-03-07 01:35:46 +00:00
Nick Kralevich
ebadeeabcf am f49ac52a: Merge "Remove /data/app/sensor_ctl_socket on boot."
* commit 'f49ac52acd958d57fdadaa792dad360cedf9db69':
  Remove /data/app/sensor_ctl_socket on boot.
2014-03-07 01:34:15 +00:00
The Android Automerger
bba0430644 merge in master-release history after reset to master 2014-03-01 05:49:04 -08:00
Nick Kralevich
f87af999ff am c609d527: am eb47925d: Merge "Drop restorecons from init.deb.rc file."
* commit 'c609d527ddb60c125ea496c1fa176a5b6f7c962b':
  Drop restorecons from init.deb.rc file.
2014-02-28 20:45:27 +00:00
Nick Kralevich
c609d527dd am eb47925d: Merge "Drop restorecons from init.deb.rc file."
* commit 'eb47925d3e3d2cee23b6907a12dcbbc2a68a02bc':
  Drop restorecons from init.deb.rc file.
2014-02-28 20:38:36 +00:00
Nick Kralevich
eb47925d3e Merge "Drop restorecons from init.deb.rc file." 2014-02-28 20:32:10 +00:00
Robert Craig
51b0a8adc5 Drop restorecons from init.deb.rc file.
Recent changes have obsoleted the need to call
restorecon on any of /data files and dirs. This
patch drops those restorecons from the file.

Change-Id: I3157538a5d37d63fa027e6f75ac69edc7a258985
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-02-26 12:47:39 -05:00
The Android Automerger
c1fec57267 merge in master-release history after reset to master 2014-02-26 05:49:04 -08:00
Nick Kralevich
2529ca3ab4 am c291ed4b: am 538e8032: Merge "Add missing restorecon_recursive calls."
* commit 'c291ed4b0f7f4d4551c4060399a840ea9f8c1259':
  Add missing restorecon_recursive calls.
2014-02-25 20:06:24 +00:00
Nick Kralevich
c291ed4b0f am 538e8032: Merge "Add missing restorecon_recursive calls."
* commit '538e80320128b46eb27e8162c91128ec8c5104cc':
  Add missing restorecon_recursive calls.
2014-02-25 19:59:20 +00:00
Nick Kralevich
538e803201 Merge "Add missing restorecon_recursive calls." 2014-02-25 19:51:13 +00:00
Stephen Smalley
5dfd0c1356 Add missing restorecon_recursive calls.
Match the ones in init.flo.rc.

Change-Id: If13f8b3412426983f0b6da24a3a0f20170b01972
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-25 14:41:51 -05:00
The Android Automerger
c05725e8ca merge in master-release history after reset to master 2014-02-25 05:49:04 -08:00
Kenny Guy
8ce2f720e7 Merge "Add new flag to indicate UI support for multi-user." 2014-02-25 13:13:28 +00:00
Nick Kralevich
a77353d768 resolved conflicts for merge of abc8fa96 to master
Change-Id: Ibd9024ed24baff21ac79403d029409276de4fda8
2014-02-24 11:24:49 -08:00
Nick Kralevich
abc8fa968f am 8816fbdd: Merge "Mount firmware partition as radio_efs_file."
* commit '8816fbdd1e4b6bd8e942c8545e37d37dc6a8357f':
  Mount firmware partition as radio_efs_file.
2014-02-24 19:15:29 +00:00
Nick Kralevich
8816fbdd1e Merge "Mount firmware partition as radio_efs_file." 2014-02-24 19:08:50 +00:00
Robert Craig
9aa72c56ae Mount firmware partition as radio_efs_file.
Add explicit context option to fstab.deb to ensure
that the radio block device is mounted with the correct
label.

Change-Id: I0892992e04bf04103c61dddd74503795d61e0a10
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-02-24 13:46:06 -05:00
The Android Automerger
2d4072dbe5 merge in master-release history after reset to master 2014-02-24 05:49:03 -08:00
Kenny Guy
f885a0fb77 Add new flag to indicate UI support for multi-user.
Change-Id: I14aa128dbd37500d6a1206487fcef5dde5625fcc
2014-02-24 12:57:24 +00:00
Dmitry Shmidt
692312911b Merge "deb: Get rid of ctrl_interface=/data/misc/wifi/sockets" 2014-02-20 19:02:24 +00:00
The Android Automerger
f45b43d142 merge in master-release history after reset to master 2014-02-20 05:49:04 -08:00
Dmitry Shmidt
eaaecff44e deb: Get rid of ctrl_interface=/data/misc/wifi/sockets
Bug: 10893961

Change-Id: I3be89a7f3102ab4d6ef338e0952e08c430fa8edb
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-02-19 17:35:39 -08:00
Nick Kralevich
54ea0528f2 am b8e3143a: am c7c78b0c: Merge "Allow kickstart_checker.sh to run in system group."
* commit 'b8e3143aa4ba02e5a5850248ac31e1b72248a6e8':
  Allow kickstart_checker.sh to run in system group.
2014-02-19 20:29:00 +00:00
Nick Kralevich
b8e3143aa4 am c7c78b0c: Merge "Allow kickstart_checker.sh to run in system group."
* commit 'c7c78b0ce009dbfb04b4373d0b205c0e6fe296dc':
  Allow kickstart_checker.sh to run in system group.
2014-02-19 20:23:08 +00:00
Nick Kralevich
c7c78b0ce0 Merge "Allow kickstart_checker.sh to run in system group." 2014-02-19 20:18:00 +00:00
Robert Craig
b99d591dc6 Allow kickstart_checker.sh to run in system group.
This change helps address an SELinux denial where the
kickstart_checker.sh script needs access to /data/qcks.

avc: denied { dac_override } for pid=214 comm="ls" capability=1 scontext=u:r:kickstart:s0 tcontext=u:r:kickstart:s0 tclass=capability

Change-Id: I0b19a1ee15b07b66007cd01daee95253c86c997a
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-02-18 10:09:41 -05:00
The Android Automerger
249aaf457f merge in master-release history after reset to master 2014-02-17 05:49:04 -08:00
Ed Tam
27c14c2b88 Enabled logging of wakeup reasons in the kernel log
Change-Id: I2c9aa1fd15168cb81a560a4ec9cf00b0100c121b
2014-02-12 17:19:42 -08:00
The Android Automerger
317f0dacd3 merge in master-release history after reset to master 2014-02-05 05:49:03 -08:00
Nick Kralevich
b860ddbe31 am 6b94d059: am 05e07c20: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
* commit '6b94d0592a35e5f1ee16e8bf955b2be66cc10e55':
  Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-02-04 19:02:51 +00:00
Nick Kralevich
6b94d0592a am 05e07c20: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."
* commit '05e07c20e3c861d0f189e12b850a831a45ded01e':
  Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
2014-02-04 18:41:21 +00:00
Nick Kralevich
05e07c20e3 Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file." 2014-02-04 18:33:14 +00:00
The Android Automerger
c658dcda5a merge in master-release history after reset to master 2014-02-04 05:49:04 -08:00
Nick Kralevich
a4ad29717a am 09a137df: am f49ac52a: Merge "Remove /data/app/sensor_ctl_socket on boot."
* commit '09a137df7572a9a364a4139103acb8e3dab0046e':
  Remove /data/app/sensor_ctl_socket on boot.
2014-02-03 17:23:00 +00:00
Nick Kralevich
09a137df75 am f49ac52a: Merge "Remove /data/app/sensor_ctl_socket on boot."
* commit 'f49ac52acd958d57fdadaa792dad360cedf9db69':
  Remove /data/app/sensor_ctl_socket on boot.
2014-02-03 17:17:33 +00:00
Nick Kralevich
f49ac52acd Merge "Remove /data/app/sensor_ctl_socket on boot." 2014-02-03 17:13:06 +00:00
Nick Kralevich
a46f687db9 Remove /data/app/sensor_ctl_socket on boot.
Unix domain sockets need to be unlinked and re-created on each
reboot regardless, and removing the old socket left by a prior boot
ensures that we do not have a dead socket file in the wrong security
context, thereby yielding denials and preventing proper removal
and re-creation by the sensors service.

This same patch was applied to flo in commit
https://android-review.googlesource.com/79110 but we forgot to
apply it to deb.

Bug: 12728711
Change-Id: Ibe7b44d7be4659806340b71a8ffb6fe977333cb9
2014-02-01 13:56:02 -08:00
Stephen Smalley
698cf1448e Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed
in the various device-specific init*.rc files but seems generic.
Move it to the main init.rc file.

Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-01-29 14:06:29 -05:00
The Android Automerger
e89e5375db merge in master-release history after reset to master 2014-01-20 05:49:03 -08:00