Commit graph

74 commits

Author SHA1 Message Date
The Android Open Source Project
12b202f250 am f9558b92: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'f9558b92ebb21e65f59908e74f995b84b415af70':
  Camera: modify /persist/camera_calibration permission
2013-06-12 07:25:52 -07:00
The Android Open Source Project
f9558b92eb Reconcile with jb-mr2-release - do not merge
Change-Id: I70c7461c9c6c1be4d767729d89ee301598a09bc9
2013-06-12 07:23:14 -07:00
bill_hwang
9bcafa5721 Camera: modify /persist/camera_calibration permission
We set this folder to 777 for factory calibration and need
to modify it to 775 for shipping image to pass CTS.

Bug: 9176084
Change-Id: I2168c528de1b1f581b64641e11fb561373a828a4
Signed-off-by: bill_hwang <bill_hwang@asus.com>
2013-06-11 17:59:35 -07:00
The Android Open Source Project
73941188ae am 499120ba: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '499120bad7b6780181998f0eb46e9a730755a740':
2013-06-11 15:37:03 -07:00
Jean-Baptiste Queru
90bd6abf89 am f5d6b743: Generate factory images
* commit 'f5d6b74358418d42d36cf91182b7f6142f2e86cb':
  Generate factory images
2013-06-11 15:37:03 -07:00
Jean-Baptiste Queru
48a3a991a3 am 009f1de5: Merge "Self-extractors for JSR72" into jb-mr2-dev-plus-aosp
* commit '009f1de5c3b078c1cbc2f56bae58bdb27b79204b':
  Self-extractors for JSR72
2013-06-11 15:28:49 -07:00
Iliyan Malchev
3e8a1fa205 am a98d916a: am 92218d70: Merge "Camera: modify /persist/camera_calibration permission" into jb-mr2-dev
* commit 'a98d916a1ac915ffc2a39785a74f4f49e7eb35ce':
  Camera: modify /persist/camera_calibration permission
2013-06-11 15:28:49 -07:00
Jean-Baptiste Queru
71deb5ab97 am 7aeb97d4: am 1aadaf6e: Fix network access on aosp_deb
* commit '7aeb97d408b17922160d1556d07a0de8cafe53b9':
  Fix network access on aosp_deb
2013-06-11 15:28:49 -07:00
The Android Open Source Project
499120bad7 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I3dc6f01d50159bc8397028514f405c0621ebda81
2013-06-11 14:56:43 -07:00
Jean-Baptiste Queru
f5d6b74358 Generate factory images
Change-Id: Idcb275d2ac9bd899febdf5b2d2ffc05fdcd74514
2013-06-11 14:45:31 -07:00
Jean-Baptiste Queru
009f1de5c3 Merge "Self-extractors for JSR72" into jb-mr2-dev-plus-aosp 2013-06-11 21:12:45 +00:00
Iliyan Malchev
a98d916a1a am 92218d70: Merge "Camera: modify /persist/camera_calibration permission" into jb-mr2-dev
* commit '92218d70cb4bdab407292f2922286c0d50ba8392':
  Camera: modify /persist/camera_calibration permission
2013-06-11 14:10:21 -07:00
Jean-Baptiste Queru
7aeb97d408 am 1aadaf6e: Fix network access on aosp_deb
* commit '1aadaf6e3d72233f330c38097ddb6eedf9eb9be1':
  Fix network access on aosp_deb
2013-06-11 14:10:20 -07:00
Jean-Baptiste Queru
047651f18e Self-extractors for JSR72
Change-Id: I689173e03f9a2137d6c0780f22a93867969a37ac
2013-06-11 10:31:41 -07:00
The Android Automerger
927e60ebe2 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-11 05:55:02 -07:00
Jean-Baptiste Queru
c41c28ff86 am d1b37a61: Merge "First pass at deb self-extractors" into jb-mr2-dev-plus-aosp
* commit 'd1b37a61510ccbb57b551454de6bdff1bc51ff8b':
  First pass at deb self-extractors
2013-06-10 17:45:51 -07:00
Jean-Baptiste Queru
d1b37a6151 Merge "First pass at deb self-extractors" into jb-mr2-dev-plus-aosp 2013-06-11 00:44:09 +00:00
Jean-Baptiste Queru
cae4c418a1 First pass at deb self-extractors
Change-Id: I4fd3ab33ce97c36377e0f261a8f1d419372c84af
2013-06-10 17:43:00 -07:00
Iliyan Malchev
92218d70cb Merge "Camera: modify /persist/camera_calibration permission" into jb-mr2-dev 2013-06-11 00:33:43 +00:00
bill_hwang
5056f4297e Camera: modify /persist/camera_calibration permission
We set this folder to 777 for factory calibration and need
to modify it to 775 for shipping image to pass CTS.

Bug: 9176084
Change-Id: I2168c528de1b1f581b64641e11fb561373a828a4
Signed-off-by: bill_hwang <bill_hwang@asus.com>
2013-06-10 17:32:06 -07:00
Jean-Baptiste Queru
1aadaf6e3d Fix network access on aosp_deb
deb-specific files need to be included before generic
files, so that they take precedence. This includes the
APN list.

Change-Id: Ida1128e292487d24ac2a59284823ef647c6312a8
2013-06-10 17:01:30 -07:00
Jean-Baptiste Queru
19814241cf am 53c4300a: am b29957ba: auto-generated blob list
* commit '53c4300a28191963ba8173dba752db2e8cb553f0':
  auto-generated blob list
2013-06-10 11:12:02 -07:00
The Android Open Source Project
7169b5406a am f08a5e12: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit 'f08a5e12a760b9d8661f6ad8ed04fd83f630ca90':
  Fix white LED permission.
  Update headphones volume warning threshold
  Update deb overlays with tablet settings (not phone)
  Add telephony features to deb-only config
  Change default wallpaper.
  Add telephony features to deb-only config
  Fix NFC & Camera
  deb: fix recovery code
  Fix deb camera library.
  deb: adjust auto-brightness curve
2013-06-10 11:11:51 -07:00
Jean-Baptiste Queru
53c4300a28 am b29957ba: auto-generated blob list
* commit 'b29957baba880caf02324fbde34da4f7c9ed217c':
  auto-generated blob list
2013-06-10 09:51:57 -07:00
The Android Open Source Project
f08a5e12a7 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Iad34e8a71fa6f1a0129fe2a0287055eea2c75129
2013-06-10 08:13:31 -07:00
Jean-Baptiste Queru
b29957baba auto-generated blob list
Bug: 4295425
Change-Id: I5710bc4404104d39ccaef1766493bef623a86f5f
2013-06-08 07:02:49 -07:00
Dave Burke
bd9baad405 Fix white LED permission.
Bug: 9079860
Change-Id: I4e515af8999c773e94a3d2777111f2564161c0ef
2013-06-06 16:43:55 -07:00
Jean-Baptiste Queru
20390089bf Merge "auto-generated blob list for deb" 2013-06-06 16:00:59 +00:00
The Android Automerger
25fd22f949 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-06 05:55:02 -07:00
Jean-Baptiste Queru
70f92614a4 auto-generated blob list for deb
Bug: 4295425
Change-Id: Ie66c6ec8763acb84a9e7996fc7e32ab6acc818a1
2013-06-06 02:08:26 -07:00
Dmitry Shmidt
604498bd31 Merge "deb: wifi: Override control iface to leave it to global" 2013-06-06 00:07:51 +00:00
Dave Burke
155f7a3f36 am 1d155098: Merge "Fix white LED permission." into jb-mr2-dev
* commit '1d1550981c36e340f5a7e155f881ed5fbba7199c':
  Fix white LED permission.
2013-06-05 16:22:13 -07:00
Dave Burke
1d1550981c Merge "Fix white LED permission." into jb-mr2-dev 2013-06-05 23:13:44 +00:00
Dmitry Shmidt
011715ecad deb: wifi: Override control iface to leave it to global
Change-Id: I0003e166a78744641d2906a0d57b19e5c1147582
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-06-05 16:06:47 -07:00
Dave Burke
d58b90072b Fix white LED permission.
Bug: 9079860
Change-Id: I4e515af8999c773e94a3d2777111f2564161c0ef
2013-06-05 15:57:20 -07:00
Eric Laurent
b228bda251 Update headphones volume warning threshold
Update headphones volume warning threshold after
measurements.

Bug: 9280753.

Change-Id: I085e6be0908f84cdc335ddc40c5a16850ea398eb
2013-06-05 15:42:07 -07:00
Ed Tam
88da8380dc Update deb overlays with tablet settings (not phone)
Bug: 9110575

Change-Id: Ia82d26994192e920d68e69d81f0e2bcd19054bc7
Signed-off-by: Ed Tam <etam@google.com>
2013-06-05 15:42:00 -07:00
johnny1_lin
e7ce7e350b am acd98472: Removed partition "modem" which does not exist
* commit 'acd984723567f7306c1696fd81b9a4ad6177903c':
  Removed partition "modem" which does not exist
2013-06-05 14:03:43 -07:00
Shashank Mittal
505b81b70a am 1cc126bc: deb: Clean up init script and fix encryption.
* commit '1cc126bcf028d5791945827a4e212306d1b601e7':
  deb: Clean up init script and fix encryption.
2013-06-05 14:03:43 -07:00
johnny1_lin
acd9847235 Removed partition "modem" which does not exist
Change-Id: I4843f79581c3b83f615aa3964ce5a237bf77370b
2013-06-05 13:30:32 -07:00
Shashank Mittal
1cc126bcf0 deb: Clean up init script and fix encryption.
Bug: 9259733

Change-Id: I48d94c47c0b7af694499a50e1b4896602e54b6b0
2013-06-05 12:47:02 -07:00
Eric Laurent
0a9e701b95 am 162859f7: Update headphones volume warning threshold
* commit '162859f7b26b5606586a7b38e7c20fdbd06ece1d':
  Update headphones volume warning threshold
2013-06-05 11:58:23 -07:00
Eric Laurent
162859f7b2 Update headphones volume warning threshold
Update headphones volume warning threshold after
measurements.

Bug: 9280753.

Change-Id: I085e6be0908f84cdc335ddc40c5a16850ea398eb
2013-06-05 11:30:43 -07:00
The Android Automerger
484b483973 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-05 09:45:39 -07:00
Ed Tam
3438823eec am 27a6f95a: Update deb overlays with tablet settings (not phone)
* commit '27a6f95a51e7668d754c5c2325ec6ec64002ba97':
  Update deb overlays with tablet settings (not phone)
2013-06-04 17:55:30 -07:00
Ed Tam
27a6f95a51 Update deb overlays with tablet settings (not phone)
Bug: 9110575

Change-Id: Ia82d26994192e920d68e69d81f0e2bcd19054bc7
Signed-off-by: Ed Tam <etam@google.com>
2013-06-04 17:33:12 -07:00
Ed Tam
33c2629652 Add telephony features to deb-only config
Bug: 9205773
Bug: 9205694
Change-Id: Iddb08ea1989ef381cb9ed1ed06fd3519504e16e8
2013-06-04 12:35:25 -07:00
Dave Burke
dfaeea583e Change default wallpaper.
Bug: 9266872
Change-Id: I680854638a3889c7b2dfb0d1a528b946d02f7895
2013-06-04 12:35:10 -07:00
Dmitry Shmidt
9cc69b48b3 Merge "deb: wifi: Use global socket interface" 2013-06-04 17:34:54 +00:00
Ramanan Rajeswaran
e2ee381a70 Remove trailing slash.
Change-Id: I2fdc4a27517adce4ef840148d2840db9869c1b46
2013-06-04 07:13:05 -07:00