Commit Graph

3955 Commits

Author SHA1 Message Date
Dianne Hackborn
eebf7b954e am 0324f4b6: Merge "Fix calling startConfirmation instead of startCommand." into lmp-preview-dev
* commit '0324f4b651e2e02319c580c16aee8d815a9beb24':
  Fix calling startConfirmation instead of startCommand.
2014-06-12 16:54:09 +00:00
Dianne Hackborn
94d9370142 Fix calling startConfirmation instead of startCommand.
Duh!

Change-Id: Ia9785a1ab37e38b7a044c2d389a1015a209654c9
2014-06-11 13:23:18 -07:00
George Mount
a035b56271 Merge "DO NOT MERGE Allow enter activity transitions to be delayed until data is ready." into lmp-preview-dev 2014-06-10 21:44:22 +00:00
George Mount
28a8d10805 DO NOT MERGE Allow enter activity transitions to be delayed until data is ready.
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
2014-06-10 17:06:34 -07:00
Craig Mautner
4c07d0246f Merge commit 'f5030ecb' into manualmerge
Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ie38e3e8b82f588d36e955664904f3ab84bdfaaf5
2014-06-11 17:12:59 -07:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
2014-06-11 16:33:00 -07:00
George Mount
426a768974 Merge "Make more descriptive exception for null viewName." 2014-06-10 22:12:51 +00:00
George Mount
d5f9d735b7 Make more descriptive exception for null viewName.
Bug 15114583

Change-Id: I73db179e032947843e3f9a7f1cc5228cbf6fc22b
2014-06-11 13:00:11 -07:00
George Mount
e089d06151 Merge "Allow enter activity transitions to be delayed until data is ready." 2014-06-10 22:06:31 +00:00
George Mount
8c2614ce43 Allow enter activity transitions to be delayed until data is ready.
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
2014-06-10 17:03:43 -07:00
Christopher Tate
70c1de2072 am 40c042b8: Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev
* commit '40c042b884696d162468d971630c48eebd84475b':
  Hide the (obsolescent) android.app.maintenance APIs
2014-06-11 17:43:20 +00:00
Christopher Tate
0188bee2c5 am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev
* commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672':
  Out with the old; in with the new
2014-06-11 17:02:18 +00:00
Jose Lima
acdee87366 am a49ab110: Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev
* commit 'a49ab11049339155c156e0f58bb076396695be75':
  Make convertToTranslucent a public method in Activity
2014-06-11 17:02:13 +00:00
Christopher Tate
863d8af75a Hide the (obsolescent) android.app.maintenance APIs
Bug 14994893

Change-Id: If3c06de006504e81c37eb6b716d613e5124d28bc
2014-06-10 18:20:24 -07:00
Jorim Jaggi
e6cad8027c am 5eb62efd: Merge "Do not override mColor with default color if none set" into lmp-preview-dev
* commit '5eb62efd935399335ee2504a483900c69a45494a':
  Do not override mColor with default color if none set
2014-06-11 12:41:45 +00:00
Christopher Tate
e9ed3707b2 Merge "Out with the old; in with the new" into lmp-preview-dev 2014-06-10 21:27:54 +00:00
Nicolas Prevot
0cc9c1e9d3 Merge "Changing the value of the user consent extra in DevicePolicyManager." 2014-06-10 21:31:35 +00:00
Jessica Hummel
542588e3ba Update documentation so it meets api requirements
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443

Conflicts:
	api/current.txt
	core/java/android/app/admin/DeviceAdminReceiver.java
2014-06-11 11:37:53 +01:00
Jose Lima
5517ea78eb Make convertToTranslucent a public method in Activity
- Changed the access level for convertToTranslucent in Activity
   to public.
   - Still keeping convertToTranslucent as a hidden method.

Bug: 15492979
Change-Id: I7d013541e8ed7708ce208cd4cf5d1c1d20d50e50
2014-06-10 13:40:09 -07:00
Christopher Tate
7060b04f6d Out with the old; in with the new
Switch to the official "JobScheduler" etc naming.

Bug 14997851

Change-Id: I73a61aaa9af0740c114d08188bd97c52f3ac86b7
2014-06-10 12:51:55 -07:00
Jorim Jaggi
7441931462 Do not override mColor with default color if none set
Bug: 15163105
Change-Id: Ibb9507b24aeaae7a571d42eb411aff25449d48fe
2014-06-10 20:57:21 +02:00
Nicolas Prevot
fb8a98d3f3 Changing the value of the user consent extra in DevicePolicyManager.
Renaming android.app.action.USER_HAS_CONSENTED to
android.app.action.ACTION_PROVISIONING_USER_HAS_CONSENTED

Change-Id: I65a3b8f1ec29a0bed5b61ff9e7587195e1c96cec
2014-06-10 17:59:27 +01:00
Matthew Williams
f53c295ae3 am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
  Add OnNetworkActive to TaskManager and simplify locking.
2014-06-10 14:55:46 +00:00
Xiaolei Wang
b71f764c28 am c686a0d4: Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev
* commit 'c686a0d4b116654d6bec3ff7d5443f8da3ffb20a':
  Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
2014-06-10 11:18:48 +00:00
Matthew Williams
5553aeb2ae Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev 2014-06-10 00:24:05 +00:00
Matthew Williams
effacfa75b Add OnNetworkActive to TaskManager and simplify locking.
Bug: 14993295
Hooks up a ConnectivityManager.NetworkActiveListener.
    
Previously was using 3 locks where 1 would suffice,
negligible to no performance issues b/c most of the previous locks
were nested.

Added OnNetworkActiveListener so that the ConnectivityController can kick of
tasks when it knows that the network is active.

Fixed some bugs that stopped timecontroller from executing tasks.

Requesting a retry will not add a deadline to that task. However backed-off
tasks are run as soon as they are ready, subject to their constraints.

Added receiver to listen for package removal and user removal, which will
delete any outstanding jobs for that uid.

Change-Id: I4c4523af558b927f19b8a215878fcc7198abb93f
2014-06-09 17:18:11 -07:00
Xiaolei Wang
2641ab276c Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev 2014-06-10 00:09:38 +00:00
Xiaolei Wang
b2b2ac1287 Add constants to Android TV On Device Search.
Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
2014-06-09 15:07:17 -07:00
Daniel Sandler
d343aff26d am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
  Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
2014-06-09 19:28:56 +00:00
Julia Reynolds
dc920984f2 Merge "Allow profile and device owners to change and get the master volume mute state." 2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad Allow profile and device owners to change and get the master volume mute state.
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
2014-06-09 14:18:01 -04:00
Ed Heyl
5adb67d4ce merge 4ce22057, regen api/current.txt
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
2014-06-09 10:41:21 -07:00
Daniel Sandler
01df1c680a Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
It sprouts an additional INTENT_ prefix to distinguish it
from the Notification.category constants in the same file.

Bug: 15022240
Change-Id: Icbc09bfc5ce78964272def66934fe4a7c848e12b
2014-06-09 16:53:51 +00:00
Robin Lee
a54c8246a5 am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit '0b889cd66fdb739a8078fb50212501849e35eb1e':
  Choose CA certificate storage according to userId
2014-06-09 14:47:04 +00:00
Jessica Hummel
f89fa83374 Merge "Update documentation so it meets api requirements" 2014-06-09 13:55:19 +00:00
George Mount
446956f789 Merge "Capture right/bottom of images properly when doing Activity Transitions." 2014-06-09 13:50:14 +00:00
Nicolas Prevot
e8b8f99dde Merge "Updating documentation for the flags of addCrossProfileIntentFilter" 2014-06-09 13:01:09 +00:00
Robin Lee
0b889cd66f am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId
2014-06-09 12:55:13 +00:00
Jason Monk
1e7bdd7174 Merge "Add an API to clear the device owner." 2014-06-09 12:48:35 +00:00
Robin Lee
3d076afc37 Choose CA certificate storage according to userId
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
2014-06-09 12:45:17 +00:00
Jessica Hummel
9da603973b Update documentation so it meets api requirements
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443
2014-06-09 13:01:03 +01:00
Nicolas Prevot
41d926e3e4 Updating documentation for the flags of addCrossProfileIntentFilter
Change-Id: I32ed07aecdc8009cbb5708777da5085feabfd4ef
2014-06-09 11:55:23 +01:00
Jinsuk Kim
f43cea0094 Merge "Remove HdmiCecService" into lmp-preview-dev 2014-06-09 01:13:29 +00:00
Jinsuk Kim
3f48068d78 Remove HdmiCecService
The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
2014-06-09 07:55:47 +09:00
Alan Viverette
830960cce0 Material theme
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
2014-06-06 15:48:55 -07:00
Alan Viverette
3cb07a462b DO NOT MERGE Material theme
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
2014-06-06 14:19:53 -07:00
Jason Monk
b0dced8173 Add an API to clear the device owner.
Only the device owner will be able to clear itself.

Change-Id: Ie3231467d92e8c5d22ec51256177793f34110432
2014-06-06 17:03:43 -04:00
Jason Monk
f10606a9a4 Merge "Add device-owner based setting of global proxy." 2014-06-06 20:50:23 +00:00
Jason Monk
03bc991834 Add device-owner based setting of global proxy.
Re-hide the setGlobalProxy on the ConnectivityManager as it requires
CONNECTIVITY_INTERNAL.  Instead add a function to the DevicePolicyManager
to set the global proxy, that can only be called by the device owner.

Change-Id: I9ffb2cc4f30a6dc9b868d86f056e1fbd512d8dfc
2014-06-06 16:43:17 -04:00