Commit graph

1878 commits

Author SHA1 Message Date
Mark Salyzyn
86997b8809 am defa1737: am b37ac46b: Merge "goldfish: logcat -Q in logd domain"
* commit 'defa1737973575e3be2dce415c68c6b13fb4fbd0':
  goldfish: logcat -Q in logd domain
2015-06-03 17:43:28 +00:00
Mark Salyzyn
1cc7735ffa goldfish: logcat -Q in logd domain
Deal with a build failure in conflict with cl/152105

Bug: 19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
2015-06-03 07:52:21 -07:00
Jeff Sharkey
c79068be5c am c2fb6e10: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev
* commit 'c2fb6e107d81e50a58fe25073f490b9dd48b31e2':
  Both ext4 and f2fs binaries for adoptable storage.
2015-05-28 22:34:32 +00:00
Jeff Sharkey
c2fb6e107d Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev 2015-05-28 19:54:17 +00:00
bohu
bb1ead7920 am 1d8b2702: Include fingerprintd on emulator images
* commit '1d8b2702675555ca1b2f074379b5a56b369e71aa':
  Include fingerprintd on emulator images
2015-05-28 02:04:40 +00:00
bohu
1d8b270267 Include fingerprintd on emulator images
Change-Id: I453d7d3fa3844bdb26c8279982b8b5b246032926
2015-05-27 17:53:11 -07:00
Jeff Sharkey
e819398870 Both ext4 and f2fs binaries for adoptable storage.
New adoptable storage feature can format media as either ext4 or
f2fs, so bring in both sets of binaries for typical products.

Bug: 20275581
Change-Id: I85380cbc8c06c958b66db879f63447ddac124cbf
2015-05-27 14:44:30 -07:00
bohu
4abbca83a9 am a2eccba1: Bump x86_64 system image size to fix build
* commit 'a2eccba17f2d9f0c6df1885c6a96987f23f0a390':
  Bump x86_64 system image size to fix build
2015-05-26 18:11:40 +00:00
bohu
a2eccba17f Bump x86_64 system image size to fix build
Bumped from 1G to 1.25G

Change-Id: I8d04166c43c792030f346cbe6ba9d6889b31359b
2015-05-26 10:40:36 -07:00
bohu
ba90e314b1 am ed6b6350: Uses SDK specific feature lists for SDK system images
* commit 'ed6b6350ea85246e508ea4b286d5ceaaa2ef29c8':
  Uses SDK specific feature lists for SDK system images
2015-05-22 23:11:58 +00:00
bohu
000055468e am 2913ecc2: Merge "Replace Launcher2 by Launcher3 for SDK system images" into mnc-dev
* commit '2913ecc2d54544fef5c98e35002d251f473b5209':
  Replace Launcher2 by Launcher3 for SDK system images
2015-05-22 22:45:38 +00:00
bohu
ed6b6350ea Uses SDK specific feature lists for SDK system images
The SDK system images does not have some features such as bluetooth;
From now on, it will use its own feature list from
device/generic/goldfish/data/etc/handheld_core_hardware.xml

bug: 21159206
Change-Id: If566d4d190dc307c6d16844dba0d17570f0ceebf
2015-05-22 15:38:13 -07:00
bohu
9b2323edf7 Replace Launcher2 by Launcher3 for SDK system images
Launcher2 is deprecated and should use Launcher3, as the latter
can handle higher resolution devices (such as Nexus 6).

Change-Id: I5215d87f8536869486bb0b6317ae382a21099925
2015-05-22 15:05:12 -07:00
Guang Zhu
7b4d4b9040 am 7fda3158: Merge "Revert "Replace Launcher2 with Launcher3"" into mnc-dev
* commit '7fda31584fd6ea78f0417abbfb96a8a15a07756c':
  Revert "Replace Launcher2 with Launcher3"
2015-05-22 16:37:09 +00:00
Guang Zhu
7fda31584f Merge "Revert "Replace Launcher2 with Launcher3"" into mnc-dev 2015-05-22 02:12:40 +00:00
Guang Zhu
ed9edb9c29 Revert "Replace Launcher2 with Launcher3"
Bug: 21164174

This reverts commit d79778faf3.

Change-Id: Ide6b2dc4c511a60bcdf22dd44369e3a9fa08d1af
2015-05-22 02:08:19 +00:00
Andres Morales
d57d6a235c am 7451df69: Merge "remove gatekeeper software module" into mnc-dev
* commit '7451df690c74731f022c244b229ecdd2f2b45f57':
  remove gatekeeper software module
2015-05-21 18:58:22 +00:00
bohu
0e9dc94f26 am d79778fa: Replace Launcher2 with Launcher3
* commit 'd79778faf3180ec0db67e7a12e0871d39867565a':
  Replace Launcher2 with Launcher3
2015-05-21 18:48:37 +00:00
Andres Morales
7451df690c Merge "remove gatekeeper software module" into mnc-dev 2015-05-21 18:27:52 +00:00
bohu
d79778faf3 Replace Launcher2 with Launcher3
Launcher2 is deprecated and should use Launcher3, as the latter
can handle higher resolution devices (such as Nexus 6).
Most importantly, Launcher3 is maintained.

Change-Id: I3a80f242af2baaebe90af93794b0ba5e249dbc7d
2015-05-21 08:16:14 -07:00
Yu Ning
0f54ada1cd Allow goldfish-setup to put the emulator in WiFi-only mode
The goldfish-setup service (essentially /system/etc/init.goldfish.sh)
executes the following commands when certain conditions are met:

 setprop ro.radio.noril yes
 stop ril-daemon

so as to stop the RIL daemon and emulate a WiFi-only device. Both would
fail, though, because goldfish-setup does not have the permissions to
set relevant properties.

This CL modifies the emulator's SELinux policy to grant the necessary
permissions. It is a step towards fixing the ril-daemon-keeps-getting-
killed-and-restarted problem with the new ("ranchu") emulator, which
does not support telephony emulation yet. (The other step is to have
init start goldfish-setup, which will be done in a seperate CL.)

(cherrypicked from commit 33dca8090f)

Change-Id: Ice7e7898804b7353ac4a8c49d871b1b2571d7a5f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-18 19:46:18 -07:00
William Roberts
c434f71bd8 Update device to use set_prop() macro
(cherrypicked from commit cccc901639)

Change-Id: I630ba0178439c935d08062892990d43a3cc1239e
Signed-off-by: William Roberts <william.c.roberts@linux.intel.com>
2015-05-18 19:20:03 -07:00
Nick Kralevich
e4ed2db2f5 am 8da1acf8: am c3b58d4a: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode"
* commit '8da1acf8b702665ce7891799cdbc86499533cc54':
  Allow goldfish-setup to put the emulator in WiFi-only mode
2015-05-19 00:50:05 +00:00
Yu Ning
33dca8090f Allow goldfish-setup to put the emulator in WiFi-only mode
The goldfish-setup service (essentially /system/etc/init.goldfish.sh)
executes the following commands when certain conditions are met:

 setprop ro.radio.noril yes
 stop ril-daemon

so as to stop the RIL daemon and emulate a WiFi-only device. Both would
fail, though, because goldfish-setup does not have the permissions to
set relevant properties.

This CL modifies the emulator's SELinux policy to grant the necessary
permissions. It is a step towards fixing the ril-daemon-keeps-getting-
killed-and-restarted problem with the new ("ranchu") emulator, which
does not support telephony emulation yet. (The other step is to have
init start goldfish-setup, which will be done in a seperate CL.)

Change-Id: Ice7e7898804b7353ac4a8c49d871b1b2571d7a5f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-19 08:22:41 +08:00
Nick Kralevich
ae7c835923 am 7b6e1ba2: am 94b4f9a5: Merge "Label /dev/ttyGF* as serial_device"
* commit '7b6e1ba2fa4edb757ff9e1c08deee9edf06fc1cc':
  Label /dev/ttyGF* as serial_device
2015-05-18 17:12:33 +00:00
Yu Ning
e9ec053e99 Label /dev/ttyGF* as serial_device
In goldfish kernel 3.10, the goldfish_tty device instantiates virtual
serial ports as /dev/ttyGF* (e.g. /dev/ttyGF0), not as /dev/ttyS* as in
goldfish kernel 3.4. However, in the emulator's SELinux security policy,
there is no specific security context assigned to /dev/ttyGF*, and the
one inherited from /dev (u:object_r:device:s0) prevents services such as
qemud and goldfish-logcat from reading and writing ttyGF*. Consequently,
qemud terminates abnormally on the classic x86_64 emulator:

 init: Service 'qemud' (pid XXX) exited with status 1

Fix this issue by assigning /dev/ttyGF* the same security context as
/dev/ttyS*.

(cherrypicked from commit 4783467922)

Change-Id: Ia7394dc217bd82f566c4d1b7eda3cc8ce3ac612f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-18 09:55:07 -07:00
Andres Morales
f1d32a1e14 remove gatekeeper software module
now implemented directly in gatekeeperd binary

Change-Id: Iaeb8e97427dbcffd1356fa955d61af55e3e330ec
2015-05-18 09:24:44 -07:00
Yu Ning
4783467922 Label /dev/ttyGF* as serial_device
In goldfish kernel 3.10, the goldfish_tty device instantiates virtual
serial ports as /dev/ttyGF* (e.g. /dev/ttyGF0), not as /dev/ttyS* as in
goldfish kernel 3.4. However, in the emulator's SELinux security policy,
there is no specific security context assigned to /dev/ttyGF*, and the
one inherited from /dev (u:object_r:device:s0) prevents services such as
qemud and goldfish-logcat from reading and writing ttyGF*. Consequently,
qemud terminates abnormally on the classic x86_64 emulator:

 init: Service 'qemud' (pid XXX) exited with status 1

Fix this issue by assigning /dev/ttyGF* the same security context as
/dev/ttyS*.

Change-Id: Ia7394dc217bd82f566c4d1b7eda3cc8ce3ac612f
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-18 17:19:08 +08:00
Nick Kralevich
05c3f7cee1 am 53df3d67: am e89b6f5d: Merge "Update device to use set_prop() macro"
* commit '53df3d67b22b70dff841b41603945d1ae4221246':
  Update device to use set_prop() macro
2015-05-15 19:46:52 +00:00
Nick Kralevich
e89b6f5df1 Merge "Update device to use set_prop() macro" 2015-05-15 19:26:56 +00:00
Nick Kralevich
b00d6937cd am 45d8cf5a: am cea991d7: Merge "Label /dev/goldfish_pipe as qemu_device"
* commit '45d8cf5aafd3108c861dadfa85e1177714fee4ae':
  Label /dev/goldfish_pipe as qemu_device
2015-05-15 16:45:04 +00:00
Yu Ning
b23b5cc4a4 Label /dev/goldfish_pipe as qemu_device
In goldfish kernel 3.10, qemu_pipe has been renamed to goldfish_pipe.
However, in the emulator's SELinux policy, there is no specific security
context assigned to /dev/goldfish_pipe, and the one inherited from /dev
(u:object_r:device:s0) prevents various processes (qemud, qemu-props,
etc.) from reading and writing goldfish_pipe. Consequently, the classic
x86_64 emulator will not boot if GPU emulation is enabled ("-gpu host"),
and does not render the UI correctly if launched with "-gpu off".

Fix this issue by assigning /dev/goldfish_pipe the same security context
as /dev/qemu_pipe.

This CL also benefits the new ("ranchu") emulator, where all supported
ABIs (arm64, mips64, x86 and x86_64) use 3.10-based kernels. Without
this fix, the new emulator boots and works, but there are avc denials
related to goldfish_pipe.

Last but not least, it is now possible to boot the classic x86 emulator
with a 3.10-based kernel instead of the current 3.4-based one, without
disabling SELinux.

(cherry-pick of commit: a5053e6b35)

Change-Id: I52e75c94d3ae3758cbbf5bc0e1d84254fdf5c6cb
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-15 07:44:28 -07:00
Nick Kralevich
cea991d778 Merge "Label /dev/goldfish_pipe as qemu_device" 2015-05-15 13:00:26 +00:00
Neil Fuller
abf5ef8fdd Merge "Add tzdatacheck to image" 2015-05-15 09:09:46 +00:00
Yu Ning
a5053e6b35 Label /dev/goldfish_pipe as qemu_device
In goldfish kernel 3.10, qemu_pipe has been renamed to goldfish_pipe.
However, in the emulator's SELinux policy, there is no specific security
context assigned to /dev/goldfish_pipe, and the one inherited from /dev
(u:object_r:device:s0) prevents various processes (qemud, qemu-props,
etc.) from reading and writing goldfish_pipe. Consequently, the classic
x86_64 emulator will not boot if GPU emulation is enabled ("-gpu host"),
and does not render the UI correctly if launched with "-gpu off".

Fix this issue by assigning /dev/goldfish_pipe the same security context
as /dev/qemu_pipe.

This CL also benefits the new ("ranchu") emulator, where all supported
ABIs (arm64, mips64, x86 and x86_64) use 3.10-based kernels. Without
this fix, the new emulator boots and works, but there are avc denials
related to goldfish_pipe.

Last but not least, it is now possible to boot the classic x86 emulator
with a 3.10-based kernel instead of the current 3.4-based one, without
disabling SELinux.

Change-Id: Iad979c0ee9d0a410be12b83ac1bef9476b50a6dc
Signed-off-by: Yu Ning <yu.ning@intel.com>
2015-05-15 16:30:57 +08:00
Neil Fuller
b0bc462877 am f9f9c3f3: Merge "Add tzdatacheck to image" into mnc-dev
* commit 'f9f9c3f31e85a96aeb13af065d8eb8dbf33dd05c':
  Add tzdatacheck to image
2015-05-14 19:27:45 +00:00
Neil Fuller
84b983a7ef Add tzdatacheck to image
Bug: 21110439
Bug: 19941636
(cherry picked from commit 7d18a68417)

Change-Id: I29ab303d2695ba1cadf70c2d2f4440d34a8cede9
2015-05-14 12:02:58 +01:00
Neil Fuller
f9f9c3f31e Merge "Add tzdatacheck to image" into mnc-dev 2015-05-14 10:15:01 +00:00
Neil Fuller
7d18a68417 Add tzdatacheck to image
Bug: 21110439
Bug: 19941636
Change-Id: I743236d9c7b433968865648ffae25451c6012a5f
2015-05-14 10:15:35 +01:00
Geoff Mendal
06b07daa70 am 8788add7: Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280
* commit '8788add72c093b16d9a2f301c3da71f0b328f3d1':
  Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280
2015-05-13 17:29:02 +00:00
Geoff Mendal
8788add72c Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release}
Bug: 21095280
2015-05-13 09:57:01 -07:00
Jeff Sharkey
7d7dbece3a am 3ce2e60f: Merge "New "sm" shell tool to call StorageManager." into mnc-dev
* commit '3ce2e60ffc13ba8f8c0ac691db27e4c422e7e2d3':
  New "sm" shell tool to call StorageManager.
2015-05-13 05:43:18 +00:00
Jeff Sharkey
3ce2e60ffc Merge "New "sm" shell tool to call StorageManager." into mnc-dev 2015-05-13 05:27:39 +00:00
William Roberts
cccc901639 Update device to use set_prop() macro
Change-Id: I630ba0178439c935d08062892990d43a3cc1239e
Signed-off-by: William Roberts <william.c.roberts@linux.intel.com>
2015-05-12 20:44:37 -07:00
Dan Albert
f807d1fa6f Merge "Remove stlport from global package list." into mnc-dev 2015-05-12 23:11:32 +00:00
Jeff Sharkey
dea22725d4 New "sm" shell tool to call StorageManager.
Bug: 19993667
Change-Id: I9021794eb6f69c7f53151a887a85788d315ab67d
2015-05-12 15:53:29 -07:00
Stephen Smalley
901d792cbf Define BOARD_SEPOLICY_DIRS for 64-bit emulators.
Define BOARD_SEPOLICY_DIRS for the arm64, mips64, and x86_64
emulator targets.  As a first cut, simply inherit from the
existing policy directories used for generic and generic_x86.
We may need further board-specific policy added for these targets
but testing will require first enabling SELinux in the relevant
kernel configs.

(cherrypicked from commit 21ebc213bb)

Change-Id: I7b4459b32298698fc2908cbbdd0e3afadbe5ac24
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-05-11 10:46:51 -07:00
Dan Albert
c6355b9464 Remove stlport from global package list.
This is now whitelisted per device.

Bug: http://b/15193147
Change-Id: I7fcd0891242fb552a17753b151cf431a398bbc44
(cherry picked from commit 0a93b56924)
2015-05-08 09:56:56 -07:00
Robin Lee
551253726f am 455ffaaf: Revert "Switch from Calculator to ExactCalculator"
* commit '455ffaafcd5b6d0296bfa6143baccb01c84e2382':
  Revert "Switch from Calculator to ExactCalculator"
2015-05-07 17:49:30 +00:00
Andreas Gampe
d9e855cd70 am 2e286f46: am afec6236: Merge "Build: Update Mips64 generic build for ART"
* commit '2e286f467b1d156c7ccc741f2c28d3a37cf78a3f':
  Build: Update Mips64 generic build for ART
2015-05-07 16:26:32 +00:00