Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I00d6980a,I814221b4,Id88603a5

Browse Source 
* changes:
  CameraBrowser: Launch itself when a camera is attached to USB.
  Send Intents when PTP compatible devices are connected/disconnected to USB
  Give system server permission to access USB.
This commit is contained in:
Mike Lockwood
2010-07-28 14:59:45 -07:00
committed by Android (Google) Code Review
parent 048391511e 725552a0df
commit 03a545e5ed
9 changed files with 291 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/hardware/Usb.java
View File

@@ -55,6 +55,24 @@ public class Usb {
public static final String ACTION_USB_STATE =
"android.hardware.action.USB_STATE";
/**
* Broadcast Action: A broadcast for USB camera attached event.
*
* This intent is sent when a USB device supporting PTP is attached to the host USB bus.
* The intent's data contains a Uri for the device in the MTP provider.
*/
public static final String ACTION_USB_CAMERA_ATTACHED =
"android.hardware.action.USB_CAMERA_ATTACHED";
/**
* Broadcast Action: A broadcast for USB camera detached event.
*
* This intent is sent when a USB device supporting PTP is detached from the host USB bus.
* The intent's data contains a Uri for the device in the MTP provider.
*/
public static final String ACTION_USB_CAMERA_DETACHED =
"android.hardware.action.USB_CAMERA_DETACHED";
/**
* Boolean extra indicating whether USB is connected or disconnected.
* Used in extras for the {@link #ACTION_USB_STATE} broadcast.

2
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -523,7 +523,7 @@ public class ZygoteInit {
String args[] = {
"--setuid=1000",
"--setgid=1000",
"--setgroups=1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,3001,3002,3003",
"--setgroups=1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1018,3001,3002,3003",
"--capabilities=130104352,130104352",
"--runtime-init",
"--nice-name=system_server",