Commit graph

475 commits

Author SHA1 Message Date
Jessica Hummel
7f22d30117 Deb devices: Add managed provisioning mime type to the types that NFC recognizes during provisioning.
I've also edited the parent class to enable nfc during setup for all devices for the managed provisioning mime type. We still need to support the nfcProvision mime type for some devices (e.g. deb).

Change-Id: I962279f13082ac89fba6f815aa34706ffed69497
2014-01-16 12:31:57 +00:00
The Android Automerger
bc15819a5b merge in master-release history after reset to master 2014-01-03 07:49:04 -08:00
Nick Kralevich
a9fb8244a4 am 60131264: am 1c2c2da7: Merge "Relabel sensors files"
* commit '60131264f6d30319b28980005a4b014f36d2c050':
  Relabel sensors files
2013-12-20 00:44:43 +00:00
Nick Kralevich
60131264f6 am 1c2c2da7: Merge "Relabel sensors files"
* commit '1c2c2da740eb37ff0b96bbd8290eb3eeafe68fec':
  Relabel sensors files
2013-12-19 16:39:03 -08:00
Nick Kralevich
1c2c2da740 Merge "Relabel sensors files" 2013-12-20 00:34:10 +00:00
Nick Kralevich
7e8ecaf084 Relabel sensors files
In device/asus/flo commit 9d6624a0, /data/misc/sensors
and /data/system/sensors were changed from system_data_file to
sensors_data_file. /data/nfc was changed from system_data_file
to nfc_data_file.

However, we forgot to fix up existing files.

Addresses the following sensors denials:

<5>[  103.234466] type=1400 audit(1387408621.036:26): avc:  denied  { setattr } for  pid=4833 comm="sensors.qcom" name="debug" dev="mmcblk0p31" ino=188441 scontext=u:r:sensors:s0 tcontext=u:object_r:system_data_file:s0 tclass=dir
<5>[  103.254089] type=1400 audit(1387408621.066:27): avc:  denied  { append } for  pid=4833 comm="sensors.qcom" name="error_log" dev="mmcblk0p31" ino=188442 scontext=u:r:sensors:s0 tcontext=u:object_r:system_data_file:s0 tclass=file
<5>[  103.273681] type=1400 audit(1387408621.086:28): avc:  denied  { open } for  pid=4833 comm="sensors.qcom" name="error_log" dev="mmcblk0p31" ino=188442 scontext=u:r:sensors:s0 tcontext=u:object_r:system_data_file:s0 tclass=file
<5>[  103.293914] type=1400 audit(1387408621.106:29): avc:  denied  { read } for  pid=4833 comm="sensors.qcom" name="debug" dev="mmcblk0p31" ino=188441 scontext=u:r:sensors:s0 tcontext=u:object_r:system_data_file:s0 tclass=dir
<5>[  103.313537] type=1400 audit(1387408621.126:30): avc:  denied  { open } for  pid=4833 comm="sensors.qcom" name="debug" dev="mmcblk0p31" ino=188441 scontext=u:r:sensors:s0 tcontext=u:object_r:system_data_file:s0 tclass=dir

nfc denials:

<5>[  579.726409] type=1400 audit(1387410509.432:35): avc:  denied  { write } for  pid=1257 comm=4173796E635461736B202331 name="nfc" dev="mmcblk0p31" ino=253953 scontext=u:r:nfc:s0 tcontext=u:object_r:system_data_file:s0 tclass=dir
<5>[  579.746185] type=1400 audit(1387410509.452:36): avc:  denied  { add_name } for  pid=1257 comm=4173796E635461736B202331 name="halStorage.bin4" scontext=u:r:nfc:s0 tcontext=u:object_r:system_data_file:s0 tclass=dir
<5>[  579.765014] type=1400 audit(1387410509.472:37): avc:  denied  { create } for  pid=1257 comm=4173796E635461736B202331 name="halStorage.bin4" scontext=u:r:nfc:s0 tcontext=u:object_r:system_data_file:s0 tclass=file
<5>[  579.783477] type=1400 audit(1387410509.492:38): avc:  denied  { write } for  pid=1257 comm=4173796E635461736B202331 name="halStorage.bin4" dev="mmcblk0p31" ino=253956 scontext=u:r:nfc:s0 tcontext=u:object_r:system_data_file:s0 tclass=file

Change-Id: Ic2076102123f9336c35974a944664ecbf8d216ae
2013-12-18 16:12:31 -08:00
Doug Zongker
ddb5532cb9 fix deb build fstab
This reverts commit 03a8c20b51, and
updates the fstab to have two entries for the radio block device.

Change-Id: I118dc87e0af39645664bc7430d4f193553df5500
2013-12-17 17:19:48 -08:00
Doug Zongker
659190c59e fix build: deb radio partition mount point changed
deb's radio partition is now found under /firmware, not /radio, and we
have to treat it as EMMC even though the regular system mounts it as
VFAT.

Change-Id: I69b6ffc9a4bf6d2ca4fc02ebd7adee5f5550b400
2013-12-17 17:19:48 -08:00
Doug Zongker
8f41eca3f4 fix deb build fstab
This reverts commit 03a8c20b51, and
updates the fstab to have two entries for the radio block device.

Change-Id: I118dc87e0af39645664bc7430d4f193553df5500
2013-12-17 12:35:49 -08:00
Doug Zongker
0de15ca658 Merge "fix build: deb radio partition mount point changed" 2013-12-17 19:01:06 +00:00
Doug Zongker
03a8c20b51 fix build: deb radio partition mount point changed
deb's radio partition is now found under /firmware, not /radio, and we
have to treat it as EMMC even though the regular system mounts it as
VFAT.

Change-Id: I69b6ffc9a4bf6d2ca4fc02ebd7adee5f5550b400
2013-12-17 10:57:14 -08:00
Doug Zongker
5fe4ce97bf merge fstabs for deb
The recovery.fstab is missing the encryption metadata information for
the data partition.

Bug: 8766487
Change-Id: I103c4994ce4b68a4d2040db1e1a728467d447202
2013-12-12 16:03:42 -08:00
Conley Owens
0d66b7355f am 65c5ecab: am a23855f5: Update for KOT49H
* commit '65c5ecab1bf982c92fb8d8da0531836496ac4b48':
  Update for KOT49H
2013-12-11 23:12:36 +00:00
Conley Owens
65c5ecab1b am a23855f5: Update for KOT49H
* commit 'a23855f5519def7f25aa3dada07bc0593722ac18':
  Update for KOT49H
2013-12-11 15:05:21 -08:00
Conley Owens
a23855f551 Update for KOT49H
Change-Id: I03c77e289e7ba0a460b6d67f33660c21193f9a22
2013-12-10 16:33:13 -08:00
Baligh Uddin
dbd346a0a3 Remove deprecated locales
Bug:11340849
Change-Id: I6937d6efb8dece572145a301b44f819e31942fcc
2013-12-09 22:39:56 +00:00
The Android Open Source Project
dce6a527c2 am c23980d1: am 643e52aa: Merge commit \'76428ec8349ae0d73455fa4b248bcc7375e08243\' into HEAD
* commit 'c23980d1bc516e2edb633d27ebc0b8077d910350':
2013-12-06 01:38:49 +00:00
The Android Open Source Project
c23980d1bc am 643e52aa: Merge commit \'76428ec8349ae0d73455fa4b248bcc7375e08243\' into HEAD
* commit '643e52aad73528d56b763f38171cfd5b895f5775':
2013-12-05 17:25:09 -08:00
The Android Open Source Project
643e52aad7 Merge commit '76428ec8349ae0d73455fa4b248bcc7375e08243' into HEAD 2013-12-05 12:38:01 -08:00
Nick Kralevich
e0eef36559 am 59be944c: am 235c62f9: am f270c350: Merge "Migrate SELinux related flo changes to deb."
* commit '59be944c9dfece43ea3f89546745f4748720313e':
  Migrate SELinux related flo changes to deb.
2013-11-23 12:41:01 -08:00
Nick Kralevich
59be944c9d am 235c62f9: am f270c350: Merge "Migrate SELinux related flo changes to deb."
* commit '235c62f95eef3f6ed44e9d35e32ee757406646ca':
  Migrate SELinux related flo changes to deb.
2013-11-23 12:36:49 -08:00
Nick Kralevich
235c62f95e am f270c350: Merge "Migrate SELinux related flo changes to deb."
* commit 'f270c350f74b4a1b07c8860fdeed2a18b5f854df':
  Migrate SELinux related flo changes to deb.
2013-11-22 17:22:09 -08:00
Nick Kralevich
f270c350f7 Merge "Migrate SELinux related flo changes to deb." 2013-11-23 00:48:32 +00:00
Nick Kralevich
a39bbf1ee9 Migrate SELinux related flo changes to deb.
Copy over the flo related SELinux changes to deb.
See https://android-review.googlesource.com/70190

Change-Id: Ie3a07b12ad6d12dedf2d0ccbfd8fb3211dcbe890
2013-11-22 11:06:35 -05:00
Conley Owens
ebb700b43a am 76428ec8: Merge "Update proprietary blobs for deb" into klp-dev
* commit '76428ec8349ae0d73455fa4b248bcc7375e08243':
  Update proprietary blobs for deb
2013-11-12 19:29:04 -08:00
Conley Owens
76428ec834 Merge "Update proprietary blobs for deb" into klp-dev 2013-11-13 01:52:52 +00:00
Conley Owens
c4d5774441 Update proprietary blobs for deb
Change-Id: I33fb2de37ccd400a67b454f9eb1994022419273a
2013-10-28 19:48:58 -07:00
Ed Tam
0e8cbe1069 am 15b9ab8d: Add back LTE to Preferred network mode options
* commit '15b9ab8da032e8716e808fbdfff579b5290de19b':
  Add back LTE to Preferred network mode options
2013-10-22 12:39:43 -07:00
Ed Tam
15b9ab8da0 Add back LTE to Preferred network mode options
Bug: 11264362

Change-Id: I6b5284fc2fc3d0614c4f9fd863d05cd3faf28701
Signed-off-by: Ed Tam <etam@google.com>
2013-10-22 12:07:19 -07:00
Robert Greenwalt
fa6a787f9d am 2c783e39: Merge "Change vzw provisioning url from get to post" into klp-dev
* commit '2c783e39505c4c6530796bc880bcab3b914cce39':
  Change vzw provisioning url from get to post
2013-10-17 16:08:50 -07:00
Robert Greenwalt
2c783e3950 Merge "Change vzw provisioning url from get to post" into klp-dev 2013-10-17 23:01:12 +00:00
Robert Greenwalt
72ef240d1c Change vzw provisioning url from get to post
Do this by injecting an auto-submitting form in the data to be
interpreted as a html doc by the browser.

bug:11168810
Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549
2013-10-17 14:33:13 -07:00
Ed Heyl
7852ad1ca7 am 85e0eb4a: merge in klp-release (no-op)
* commit '85e0eb4a7db41aafe1126ee00c49293abfb7ea12':
2013-10-16 17:49:08 -07:00
Ed Heyl
85e0eb4a7d merge in klp-release (no-op) 2013-10-16 17:35:22 -07:00
Ed Heyl
3a83e000ae am 1c91a0d5: merge in KQS81M
* commit '1c91a0d574eec09053405a6904bf7accef9c09b3':
  wlan: fix syntax error for enable riva ssr.
  Add mobile_provisioning_apn.
2013-10-09 09:11:58 -07:00
The Android Automerger
995b98b9cc merge in klp-release history after reset to klp-dev 2013-10-09 06:00:05 -07:00
Daniel Sandler
d4d6269489 am 000bdf24: Mute low-battery sounds after one hour with screen off.
* commit '000bdf24cf53eea3668e36bfa7af1fa735ff9e97':
  Mute low-battery sounds after one hour with screen off.
2013-10-08 16:02:17 -07:00
Ed Heyl
1c91a0d574 merge in KQS81M 2013-10-08 15:35:53 -07:00
Daniel Sandler
000bdf24cf Mute low-battery sounds after one hour with screen off.
Requires change Iddd42038 in frameworks/base.

Bug: 10487557
Change-Id: I1549043f28b87664434f9fe374c551de5d996edb
2013-10-07 11:24:46 -04:00
The Android Automerger
5393d060ff merge in klp-release history after reset to klp-dev 2013-09-25 06:00:05 -07:00
Ed Heyl
5263433fcc am bd799bd2: auto-generated blob list for deb
* commit 'bd799bd25d8cb116143d69b54dc2c1dd4e84135b':
  auto-generated blob list for deb
2013-09-24 14:11:46 -07:00
Ed Heyl
bd799bd25d auto-generated blob list for deb
Bug: 4295425
Change-Id: Ib79ecb1e7feafbf06cefdfd60d40484e0b918986
2013-09-24 02:38:09 -07:00
The Android Automerger
072e4c72ed merge in klp-release history after reset to klp-dev 2013-09-19 06:00:03 -07:00
Todd Poynor
63e2a59f28 deb: changes for healthd charger mode
Change-Id: I71c3bf4c524938fb6daec3a3d22ce140bc5d59d9
2013-09-18 21:30:52 +00:00
Ed Heyl
82064c970f am 1cc281c1: (-s ours) cherry-pick 96e125ff: Revert Remove AOSP support. Do not merge.
* commit '1cc281c187fb6dcfe94bed08d00c2c4c2099e46f':
  cherry-pick 96e125ff: Revert Remove AOSP support. Do not merge.
2013-09-18 08:54:49 -07:00
Ed Heyl
1cc281c187 cherry-pick 96e125ff: Revert Remove AOSP support. Do not merge.
Change-Id: I07cbd94dfbac543bfee3e1b0c625b2e7d7540d32
2013-09-17 11:46:57 -07:00
Ed Tam
efc0d3c25b wlan: fix syntax error for enable riva ssr.
Bug: 10674988

Change-Id: I684d3902f8a40053c264f47a54fd12376588d783
Signed-off-by: Ed Tam <etam@google.com>
2013-09-10 17:12:56 -07:00
Ed Tam
d3a3713b97 am 397e7be3: wlan: fix syntax error for enable riva ssr.
* commit '397e7be352cc4244cc132887fb570fc66efec63e':
  wlan: fix syntax error for enable riva ssr.
2013-09-10 16:00:31 -07:00
Ed Tam
397e7be352 wlan: fix syntax error for enable riva ssr.
Bug: 10674988

Change-Id: I684d3902f8a40053c264f47a54fd12376588d783
Signed-off-by: Ed Tam <etam@google.com>
2013-09-10 14:07:05 -07:00
The Android Automerger
2d3463f265 merge in klp-release history after reset to klp-dev 2013-09-09 06:00:03 -07:00