17447 Commits

Author SHA1 Message Date
Nicolas Prevot
c6cf95c0f5 Making the content resolver work with result intents.
prepareToLeaveUser is called if necessary on result intents.
Adding the targetUserId to grantUriPermissionFromIntentLocked
This allows the GET_CONTENT intent to work across profiles.

Change-Id: Id81280c23247aeda7ad56e34af9b12a6f3a00a3c
2014-05-29 11:30:36 +01:00
Christoph Studer
29fae7b394 am 1468841a: Merge "NoMan: Don\'t unbind system listeners" into lmp-preview-dev
* commit '1468841afc1431ddd0d3c843e41fa7a14c16e430':
  NoMan: Don't unbind system listeners
2014-05-28 12:13:14 +00:00
Christoph Studer
19a81a616f Merge "NoMan: Don't unbind system listeners" into lmp-preview-dev 2014-05-28 12:10:34 +00:00
Jinsuk Kim
b0674f0f7c Fix a couple of bugs in CEC services
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-05-28 09:30:39 +00:00
Matthew Williams
bc132a068b Merge "Implementation of TaskManager reschedule/cancel" 2014-05-28 02:52:00 +00:00
Fabrice Di Meglio
4a4a17aa11 am f52b9c8a: Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev
* commit 'f52b9c8a4aebf6d04b747e45c921fa4f51344b34':
  Revert "Only allow 1 Stack on Leanback-only devices"
2014-05-28 01:53:43 +00:00
Fabrice Di Meglio
c82e7d30e3 Revert "Only allow 1 Stack on Leanback-only devices"
This is making a HH device (and probably others) in a reboot loop

This reverts commit 0cac71e9bdee1e9e6b2faafec0f9f894effbcb67.

===

See:

W/dalvikvm( 2320): threadid=1: thread exiting with uncaught exception (group=0x952d3f28)
E/AndroidRuntime( 2320): *** FATAL EXCEPTION IN SYSTEM PROCESS: main
E/AndroidRuntime( 2320): java.lang.RuntimeException: Failed to create service com.android.server.am.ActivityManagerService$Lifecycle: service constructor threw an exception
E/AndroidRuntime( 2320): 	at com.android.server.SystemServiceManager.startService(SystemServiceManager.java:89)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:304)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.run(SystemServer.java:244)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServer.main(SystemServer.java:161)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Method.invokeNative(Native Method)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Method.invoke(Method.java:515)
E/AndroidRuntime( 2320): 	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:836)
E/AndroidRuntime( 2320): 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:631)
E/AndroidRuntime( 2320): 	at dalvik.system.NativeStart.main(Native Method)
E/AndroidRuntime( 2320): Caused by: java.lang.reflect.InvocationTargetException
E/AndroidRuntime( 2320): 	at java.lang.reflect.Constructor.constructNative(Native Method)
E/AndroidRuntime( 2320): 	at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
E/AndroidRuntime( 2320): 	at com.android.server.SystemServiceManager.startService(SystemServiceManager.java:78)
E/AndroidRuntime( 2320): 	... 8 more
E/AndroidRuntime( 2320): Caused by: java.lang.NullPointerException
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityStackSupervisor.isLeanbackOnlyDevice(ActivityStackSupervisor.java:3508)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityStackSupervisor.<init>(ActivityStackSupervisor.java:220)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityManagerService.<init>(ActivityManagerService.java:2145)
E/AndroidRuntime( 2320): 	at com.android.server.am.ActivityManagerService$Lifecycle.<init>(ActivityManagerService.java:2073)
E/AndroidRuntime( 2320): 	... 11 more
E/AndroidRuntime( 2320): Error reporting crash
E/AndroidRuntime( 2320): java.lang.NullPointerException
E/AndroidRuntime( 2320): 	at com.android.internal.os.RuntimeInit$UncaughtHandler.uncaughtException(RuntimeInit.java:89)
E/AndroidRuntime( 2320): 	at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:693)
E/AndroidRuntime( 2320): 	at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:690)
E/AndroidRuntime( 2320): 	at dalvik.system.NativeStart.main(Native Method)
I/Process ( 2320): Sending signal. PID: 2320 SIG: 9
I/ServiceManager(  174): service 'power' died
I/ServiceManager(  174): service 'sensorservice' died

Change-Id: Ib90ae4dff6542d67f5827b100a3ab6158ce88ae2
2014-05-28 01:46:05 +00:00
Matthew Williams
b61c506a50 Implementation of TaskManager reschedule/cancel
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions

Change-Id: I0264c2614cc52c28730abbcb1557f314f058f991
2014-05-27 18:36:54 -07:00
Jose Lima
ca7ddbfef7 am 00430954: Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev
* commit '004309546b7efa188df56e58539e4227ed192cf7':
  Only allow 1 Stack on Leanback-only devices
2014-05-28 00:13:36 +00:00
Jose Lima
a5c7e0f80f Only allow 1 Stack on Leanback-only devices
- For Leanback only devices we will force all activities to
   live in the same app stack. This is a design decision for the
   shy/gregarious changes we are planning to implement for
   leanback devices.

Change-Id: I201f56541ba22356e9598f09419ad41e588c74dc
2014-05-27 16:51:35 -07:00
Adrian Roos
b9fc22029f am 9fb0925e: Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev
* commit '9fb0925e0ea64ac6124cc0c843db05155cc4ea64':
  Add and improve logged TrustAgent connection events
2014-05-27 23:50:36 +00:00
Adrian Roos
26690339e9 Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev 2014-05-27 23:46:50 +00:00
Nick Kralevich
70c117a873 Fix Tethering NPE
Bug: 10733373
Change-Id: I1d81eb8a60be2b672b925be7577f1288fe870237
2014-05-27 15:31:41 -07:00
Robert Greenwalt
afa05c0b43 Move dis/enable of mobile data to Telephony
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
2014-05-27 20:28:50 +00:00
Winson Chung
a64a5fe68c am bff02603: Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev
* commit 'bff026033d40ee48e9bf8dca17e1fbbee8b41293':
  Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)
2014-05-27 19:30:40 +00:00
Winson Chung
8804ce96b1 Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev 2014-05-27 19:28:51 +00:00
Chris Wren
42db9d0b23 am ba8af498: Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev
* commit 'ba8af498f08d4ac2e7712a8d307d24112ca1bc8e':
  Reduce logspam by catching unexpected types ourselves.
2014-05-27 19:20:56 +00:00
Chris Wren
2ed67e6de7 Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev 2014-05-27 19:15:25 +00:00
Winson Chung
9693d95343 Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)
Change-Id: I371ee43296a983782eaed2e661b1febc71c86433
2014-05-27 11:09:22 -07:00
Winson Chung
5859fc1096 Merge "DO NOT MERGE" into lmp-preview-dev 2014-05-27 18:04:36 +00:00
Adrian Roos
7d59b4f981 Add and improve logged TrustAgent connection events
Adds events for when a TrustAgentService gets connected
or is stopped. Also explicitly revokes trust when a
trust agent gets disconnected, such that it shows up in
dumpsys.

Bug: 15281644
Change-Id: I5875a34da923345683279c1f755d43454ff6318d
2014-05-27 20:01:45 +02:00
Christoph Studer
21b6c49a2d am f626c676: Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev
* commit 'f626c67604a317bbcb1963a71b66a30b92df2973':
  NoMan: Allow disabling SQLiteLog.
2014-05-27 17:45:19 +00:00
Christoph Studer
d68200c66b Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev 2014-05-27 17:41:34 +00:00
Christoph Studer
e397521449 Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev 2014-05-27 17:41:03 +00:00
Winson Chung
2eb4f9c377 DO NOT MERGE
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
2014-05-27 17:07:52 +00:00
Winson Chung
8f4f2ff5cb Merge "DO NOT MERGE " into lmp-preview-dev 2014-05-27 17:07:10 +00:00
Craig Mautner
39c1f59541 resolved conflicts for merge of 754a8c4c to master
Change-Id: I750b714248486eb8609951caa10be7a543f624da
2014-05-27 09:41:52 -07:00
Craig Mautner
c752919c7c Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev 2014-05-27 16:37:45 +00:00
Craig Mautner
b539b3aafb Do not start tasks on ActivityViews unless explicit. DO NOT MERGE
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-05-27 09:22:55 -07:00
Craig Mautner
754a8c4c95 am 1b4bf857: Do not start tasks on ActivityViews unless explicit
* commit '1b4bf857d34dc58a4ef84f5f0761bb7685051fbb':
  Do not start tasks on ActivityViews unless explicit
2014-05-27 16:22:39 +00:00
Craig Mautner
1b4bf857d3 Do not start tasks on ActivityViews unless explicit
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c
2014-05-27 09:19:28 -07:00
Craig Mautner
bcede43413 am b984a072: Merge "Add more error checking to xml restore" into lmp-preview-dev
* commit 'b984a072a7addc2404ea9ae2f67ccfa85e686167':
  Add more error checking to xml restore
2014-05-27 16:16:47 +00:00
Craig Mautner
5d0045835b Merge "Add more error checking to xml restore" into lmp-preview-dev 2014-05-27 16:13:28 +00:00
Christoph Studer
711259a9e4 NoMan: Disable SQLite log DO NOT MERGE
Bug: 15279504
Change-Id: I76f9283675537607729ed450471ef4b1d9ec3898
2014-05-27 16:56:47 +02:00
Christoph Studer
05e2884972 NoMan: Allow disabling SQLiteLog.
Bug: 15279504
Change-Id: I561391a312f88a7d5e11b180984f18bb1d3dcda0
2014-05-27 16:55:57 +02:00
Craig Mautner
5122fb6a92 am 463f9006: Merge "Only start TaskPersister once." into lmp-preview-dev
* commit '463f9006c56d66b5213edecc150863b450a7e573':
  Only start TaskPersister once.
2014-05-27 14:28:10 +00:00
Craig Mautner
b45a730efb Merge changes I88865c02,I34cc1310 into lmp-preview-dev
* changes:
  Check for null DO NOT MERGE
  Improve DocCentric documentation. DO NOT MERGE
2014-05-27 14:24:04 +00:00
Craig Mautner
e88d180d6c am e2c92ac8: Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev
* commit 'e2c92ac847d151cbf4d578ee85d3ff10126e9ada':
  Update launchFlags after changing Intent flags
2014-05-27 14:23:35 +00:00
Craig Mautner
8aa29921df Merge "Only start TaskPersister once." into lmp-preview-dev 2014-05-27 14:22:04 +00:00
Chris Wren
fb69da323b Reduce logspam by catching unexpected types ourselves.
Also fix a bug in the conversion of ArrayLists to String[].

Change-Id: I839c80d0b571be298062d511dd3c83cc1e263f54
2014-05-27 10:19:07 -04:00
Craig Mautner
bf1bf9dea7 Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev 2014-05-27 14:14:34 +00:00
Craig Mautner
e0129b3c67 Add more error checking to xml restore
Bad files and OS updates can cause the restore to throw an NPE.
Rather than bring down the server process over this, just delete
the persistent file and keep going.

Fixes bug 15219594.

Change-Id: Id9cd39988ff93a26def036a05c46209364f2a4c0
2014-05-27 06:56:44 -07:00
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Jinsuk Kim
0bc8b0718f Fix a bug using wrong addresses for CEC logical address allocation
Change-Id: I41da586c16dca4f325d147bb3abe5d4e09f7b91c
2014-05-27 09:52:40 +00:00
Jinsuk Kim
7fe2ae0fe9 Hook up the CEC playback API to service internal logic.
This change enables CEC playback API (oneTouchPlay, queryDisplayStatus).
Also updated local device list type to SparseArray to make it easy
to get one based on device type.

Change-Id: I6f88b2dac2d873c493a90411549a4e5719a5e460
2014-05-27 04:45:23 +00:00
Wonsik Kim
c3a6e23e3f am e32b2d32: Revert "Revert "Add physical TV input handling to TvInputManagerService""
* commit 'e32b2d32d7e4a492bb3038c7bc55988a908437a4':
  Revert "Revert "Add physical TV input handling to TvInputManagerService""
2014-05-27 04:08:51 +00:00
Wonsik Kim
c22dbb6919 Revert "Revert "Add physical TV input handling to TvInputManagerService""
This reverts commit 1940e197a8de186df5edf0b78e0907ae539bd215.

Bug: 14118245, Bug: 15197740
Change-Id: Ia308f16d2ed8ec55112a4d21c180ccb97e8d7c6a
2014-05-27 01:33:50 +00:00
Craig Mautner
87f851d0ba Only start TaskPersister once.
Because ActivityManagerService.systemReady() is reentrant we could
restore tasks and start the TaskPersister more than one time. This
fix limits operations on TaskPersister to one time only.

Fixes bug 15256579.

Change-Id: I6bf2c26b37acdfd9b15a6f277966966b743d03b6
2014-05-26 16:52:58 -07:00
Christoph Studer
5d423844f2 NoMan: Don't unbind system listeners
Listeners registered via INotificationMananger.registerListener()
must not be unbound by NoMan because it won't be able to re-bind
them later.

Bug: 15131411
Change-Id: Ic5088252c86e7c32c522ba1606f123cefde3720d
2014-05-26 16:07:37 +02:00
Jungshik Jang
1a4485dcd2 Add HdmiCecDeviceInfo to HdmiCecLocalDevice
As HdmiCecLoclaDevice is a wrapper for local devices
it should include cec device info.

Change-Id: I479665b2aa6bd56470b79dbbb7fb1015f6356090
2014-05-26 13:52:14 +09:00