115317 Commits

Author SHA1 Message Date
Glenn Kasten
8a0d133cd7 Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev 2013-11-12 18:40:42 +00:00
Eino-Ville Talvala
ed676b2197 am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev
* commit '4d12d8bef6d04c16fc18f10437ffc49bcdfabf9b':
  Camera2: Add support for partial result metadata quirk
2013-11-12 10:29:18 -08:00
Eino-Ville Talvala
4d12d8bef6 Merge "Camera2: Add support for partial result metadata quirk" into klp-dev 2013-11-12 18:27:06 +00:00
Craig Mautner
2c2549c5f4 Add event logging for tasks and stacks.
Also remove crufty write-only DisplayContent.mStackHistory.

Change-Id: I62b2b53dc02377c5d0d3b79df70b1990eed87d23
2013-11-12 09:57:00 -08:00
Scott Main
7774d8e723 am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
* commit '44895333dad66be0ab5350b039d828f3da2a1b73':
  clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
2013-11-12 17:56:03 +00:00
Scott Main
44895333da clarify that ANDROID_ID is unique for each user in multi-user environment.
bug: 8073630

Change-Id: Iff18e892a1e0422a85edd83f97ba4285f2171f74
2013-11-12 09:23:13 -08:00
John Spurlock
41f6464b3f Ensure wallpaper hint is at least as large as the display.
Bug:11332853
Bug:11606952
Change-Id: I1840d7b723015c379da8eab7e22aa478d56adeb3
2013-11-12 10:28:14 -05:00
Jeff Brown
854395add8 am c481a634: Merge "UI tweaks." into klp-dev
* commit 'c481a634f4db6e95bc03b22b72414ba12da99f4b':
  UI tweaks.
2013-11-11 22:01:22 -08:00
Jeff Brown
c481a634f4 Merge "UI tweaks." into klp-dev 2013-11-12 05:57:48 +00:00
Jeff Brown
39ad0e5598 UI tweaks.
Hide disabled routes from the chooser.

Fix layout of chooser dialog when the settings button is visible and
the list is very long to prevent truncation of the settings button.

Fix an issue when we fake the route connecting status when a route
is selected.  The route changed notification needs to be propagated
to apps.  Fake it better.

Immediately disconnect from a route when the connection is lost or
a connection attempt fails.  Added a few new test displays for this
case.

Bug: 11257292
Change-Id: I360ab5dc937ad60d97592eab54b19f034519645e
2013-11-11 21:48:53 -08:00
Jean Chalard
c1a11f17a2 Improve documentation for InputType and EditorInfo.
Bug: 11245912
Change-Id: Ie92ba20079461f7f0e30d969ba3692fec3a3b97f
2013-11-12 14:13:55 +09:00
Svetoslav
52dedb8918 am 512c722f: Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev
* commit '512c722f14bf9ddad5c280c7bff4106410114ad7':
  PreferencesFragment showing the breadcrumb area in single pane mode.
2013-11-11 20:02:53 -08:00
Svetoslav
512c722f14 Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev 2013-11-12 04:01:16 +00:00
Svetoslav
2b8795a9db PreferencesFragment showing the breadcrumb area in single pane mode.
If the PreferenceActivity is running in a single pane mode we are
not showing the headers and the breadcrumb area. However, when this
activity is restarted and has a saved state to restore we are trying
to use headers even in a single pane mode. As a result the breadcrumb
area is shown and the content is shifted to the bottom with an empty
space at the top. This change ignores the saved headers from the
saved instance state in a single pane mode. Note that in such a case
these headers are null anyway as we do not use them.

bug:11242762

Change-Id: I2828bc82762695d9c93fb4ca43933598a9b12b87
2013-11-11 18:31:54 -08:00
Dianne Hackborn
0259c01022 am 596e409e: Merge "Work on issue #11634365: Leaking restarting services" into klp-dev
* commit '596e409ec9703e5071bb9a0de08787cde7745f7a':
  Work on issue #11634365: Leaking restarting services
2013-11-11 18:01:15 -08:00
John Spurlock
da721a99fe am 778eaf4b: Merge "Disallow transient status bar on the keyguard." into klp-dev
* commit '778eaf4bece18d08e91df1d405337a18c3abcd57':
  Disallow transient status bar on the keyguard.
2013-11-11 18:01:12 -08:00
Scott Main
57a81a7839 am 4c6b1afb: fix typo and clarify meminfo discussion bug: 11589682
* commit '4c6b1afb5b1c750b762ec446604834676f1e306b':
  fix typo and clarify meminfo discussion bug: 11589682
2013-11-12 01:58:49 +00:00
Dianne Hackborn
596e409ec9 Merge "Work on issue #11634365: Leaking restarting services" into klp-dev 2013-11-12 01:36:10 +00:00
Scott Main
4c6b1afb5b fix typo and clarify meminfo discussion
bug: 11589682

Change-Id: I3b46e6e2ae768284270b3e46c39c7cf14e65d7f7
2013-11-11 17:34:33 -08:00
John Spurlock
778eaf4bec Merge "Disallow transient status bar on the keyguard." into klp-dev 2013-11-12 01:28:41 +00:00
Dianne Hackborn
d6f5b62921 Work on issue #11634365: Leaking restarting services
Tighten up some flows to try to avoid any chance of leaving
a restarting service on the list, add a log to the only remaining
place I could find that we could get in to trouble for some
reason.

Change-Id: Iffb9be9d97deefc6cf0c5790eedfeb6e4e8a36bc
2013-11-11 17:25:37 -08:00
Fabrice Di Meglio
82d37b40c5 Fix bug #11586041 Regression: text truncation in Clock
Background padding should be used only and only if
- no padding is already defined into a layout file
- an explicit call to setBackground() / setBackgroundDrawable() has been done

Change-Id: I0a732c61b898e006ee86377bcbe7691740d68111
2013-11-11 16:52:49 -08:00
Jatin Lodhia
64234cfc1e am 09e7e0ef: Delegate existence of account check to Authenticator.
* commit '09e7e0ef8bcd8b7b78b79fb570de2032871f0c97':
  Delegate existence of account check to Authenticator.
2013-11-11 15:54:31 -08:00
Jatin Lodhia
09e7e0ef8b Delegate existence of account check to Authenticator.
Current AccountManager code for getAuthToken checks if the account
in the request exists. If the account does not exist then it throws
an exception which leads to a runtime exception being thrown by
AccountManager in the client. In perticular, Checkin client code
hits this issue when accounts are deleted by user. As the exception
is thrown from the getAuthToken method call and is a RuntimeException
it is not caught by the client. Futhermore, Checkin runs in one of the
important processes and this exception makes the process crash.

This cl, does the following:
1) Delegates the account exists check to Authentictor which in turn
would cause an AuthenticatorException which is a checked exception.
2) Replaces some of the runtime exceptions thrown by AccountManagerService
with calling AccountManagerResponse.onError() which causes more graceful
failure on the client.
3) Correctly passes on the error returned by Authenticator to
AccountManager. Earlier if Authenticator returned an error code to
the AccountManager, it ignored the error and returned null token to the
client which was incorrect.

Bug: 10856295
Change-Id: Ie250fec601d46f6dfecd74677b478bfd4e9dcfad
2013-11-11 23:48:53 +00:00
Jean-Michel Trivi
f99e8650c9 am fed822cb: Merge "Fix Tethys asset" into klp-dev
* commit 'fed822cb8e17579dfa792b40ebe82683088e7779':
  Fix Tethys asset
2013-11-11 15:47:36 -08:00
Jean-Michel Trivi
fed822cb8e Merge "Fix Tethys asset" into klp-dev 2013-11-11 23:44:28 +00:00
Jeff Sharkey
34163e8259 am 55d12486: Merge "Give storage provider access to secondary devices." into klp-dev
* commit '55d12486df5e801dc8e74d96abdf87a250bc0ba1':
  Give storage provider access to secondary devices.
2013-11-11 15:19:44 -08:00
Jeff Sharkey
55d12486df Merge "Give storage provider access to secondary devices." into klp-dev 2013-11-11 23:16:38 +00:00
Baligh Uddin
6164b1666b am 840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '840587b309d52d31f9b4f3dc6e709145a9c96d6d':
  Import translations. DO NOT MERGE
2013-11-11 14:41:14 -08:00
Baligh Uddin
4f2ff756e1 am 082c7dbc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '082c7dbc02962b321d6d6efddd683d056579b29d':
  Import translations. DO NOT MERGE
2013-11-11 14:41:12 -08:00
Baligh Uddin
17d19c27c0 am c0c41cbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c0c41cbee8c8cee2639bdb63860c378d6522feaa':
  Import translations. DO NOT MERGE
2013-11-11 14:41:09 -08:00
Baligh Uddin
840587b309 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-11 22:39:35 +00:00
Baligh Uddin
082c7dbc02 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-11 22:39:21 +00:00
Baligh Uddin
c0c41cbee8 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-11 22:39:04 +00:00
Jeff Sharkey
7e1f5410ff Give storage provider access to secondary devices.
Bug: 11411460
Change-Id: I3827ed5b859a68c60742a27917459e8df2c276bb
2013-11-11 14:36:33 -08:00
Eino-Ville Talvala
7a31310439 Camera2: Add support for partial result metadata quirk
- Add new CaptureListener.onCapturePartial() callback for receiving
  partial result metadata sooner than the full result metadata will be sent
  in onCaptureComplete().
- Add hidden keys for the partial result quirk
- Dispatch results to onCapturePartial based on the partial result quirk

All additions are hidden for now.

Bug: 11115603
Change-Id: Ie9a3be640f147257ae22e5b5edf0974bddc1cb85
2013-11-11 13:47:46 -08:00
John Spurlock
f92b6161b8 Disallow transient status bar on the keyguard.
FLAG_FULLSCREEN on the app under the keyguard was keeping
the transient status bar visible if the user locked while
revealing it.

Bug:11629810
Change-Id: I034d3a4f4fe5463702253a1fca6d32debd520c3c
2013-11-11 15:01:16 -05:00
Amith Yamasani
f65c0a9958 Fix inconsistency in reporting device admin active state.
When a device admin goes away due to a package change, only one of two lists
was being updated, causing an inconsistency in the query for active admins
depending on which API was being called.

This makes sure that mAdminMap stays in sync with mAdminList so that
isActiveAdmin() and getActiveAdmins() returns the same results.

Bug: 11588094
Change-Id: I232608738249492d9fca7e4d7aa7566d96fccf46
2013-11-11 11:44:37 -08:00
Dianne Hackborn
7e40e31763 am c85a1143: Merge "Fix issue #11630188: Still seeing some processes not on LRU list errors" into klp-dev
* commit 'c85a1143aa7be1cef40cba72f83c71e81fe5c86e':
  Fix issue #11630188: Still seeing some processes not on LRU list errors
2013-11-11 11:33:38 -08:00
Dianne Hackborn
c85a1143aa Merge "Fix issue #11630188: Still seeing some processes not on LRU list errors" into klp-dev 2013-11-11 19:31:59 +00:00
Dianne Hackborn
bc72dce075 Fix issue #11630188: Still seeing some processes not on LRU list errors
This happened:

android.util.Log$TerribleFailure: Adding dependent process ProcessRecord{43c7a120 0:com.google.android.gms/u0a7} not on LRU list: service connection ConnectionRecord{437c16e0 u0 CR ACT com.google.android.gms/.icing.impl.IndexService:@436ba7f8} from ProcessRecord{43c64208 4908:com.google.android.googlequicksearchbox:search/u0a19}
	at android.util.Log.wtf(Log.java:290)
	at android.util.Slog.wtf(Slog.java:82)
	at com.android.server.am.ActivityManagerService.updateLruProcessInternalLocked(ActivityManagerService.java:2290)
	at com.android.server.am.ActivityManagerService.updateLruProcessLocked(ActivityManagerService.java:2508)
	at com.android.server.am.ActiveServices.updateServiceClientActivitiesLocked(ActiveServices.java:636)
	at com.android.server.am.ActiveServices.removeConnectionLocked(ActiveServices.java:1656)
	at com.android.server.am.ActiveServices.unbindServiceLocked(ActiveServices.java:860)
	at com.android.server.am.ActivityManagerService.unbindService(ActivityManagerService.java:12773)
	at android.app.ActivityManagerNative.onTransact(ActivityManagerNative.java:869)
	at com.android.server.am.ActivityManagerService.onTransact(ActivityManagerService.java:2071)
	at android.os.Binder.execTransact(Binder.java:404)
	at dalvik.system.NativeStart.run(Native Method)

Because of this earlier:

11-09 18:02:19.126 W/ActivityManager(  809): Exception when starting service com.google.android.gms/.icing.impl.IndexService
11-09 18:02:19.126 W/ActivityManager(  809): android.os.DeadObjectException
11-09 18:02:19.126 W/ActivityManager(  809): 	at android.os.BinderProxy.transact(Native Method)
11-09 18:02:19.126 W/ActivityManager(  809): 	at android.app.ApplicationThreadProxy.scheduleCreateService(ApplicationThreadNative.java:850)
11-09 18:02:19.126 W/ActivityManager(  809): 	at com.android.server.am.ActiveServices.realStartServiceLocked(ActiveServices.java:1384)
11-09 18:02:19.126 W/ActivityManager(  809): 	at com.android.server.am.ActiveServices.bringUpServiceLocked(ActiveServices.java:1294)
11-09 18:02:19.126 W/ActivityManager(  809): 	at com.android.server.am.ActiveServices.bindServiceLocked(ActiveServices.java:755)
11-09 18:02:19.126 W/ActivityManager(  809): 	at com.android.server.am.ActivityManagerService.bindService(ActivityManagerService.java:12766)
11-09 18:02:19.126 W/ActivityManager(  809): 	at android.app.ActivityManagerNative.onTransact(ActivityManagerNative.java:859)
11-09 18:02:19.126 W/ActivityManager(  809): 	at com.android.server.am.ActivityManagerService.onTransact(ActivityManagerService.java:2071)
11-09 18:02:19.126 W/ActivityManager(  809): 	at android.os.Binder.execTransact(Binder.java:404)
11-09 18:02:19.126 W/ActivityManager(  809): 	at dalvik.system.NativeStart.run(Native Method)

Not clearing the service's app pointer.

Also fix this wtf where we were not clearing the started state of
a ServiceTracker when its process goes away.  (This was like this
because we used to want to leave the started state so that we can
know the process is trying to restart.  But now that have a new
explicit restarting strate, there is no need to leave it.)

android.util.Log$TerribleFailure: Service owner ServiceRecord{436f5168 u0 com.dirtywaterlabs.uberhype/com.dirtywaterlabs.musichype.MDService} cleared while started: pkg=com.dirtywaterlabs.uberhype service=com.dirtywaterlabs.musichype.MDService proc=ProcessState{42bf4bb8 com.dirtywaterlabs.uberhype:remote/10115 pkg=com.dirtywaterlabs.uberhype}
	at android.util.Log.wtf(Log.java:290)
	at android.util.Slog.wtfStack(Slog.java:86)
	at com.android.internal.app.ProcessStats$ServiceState.clearCurrentOwner(ProcessStats.java:2989)
	at com.android.server.am.ActiveServices.serviceDoneExecutingLocked(ActiveServices.java:1821)
	at com.android.server.am.ActiveServices.serviceProcessGoneLocked(ActiveServices.java:1779)
	at com.android.server.am.ActiveServices.removeConnectionLocked(ActiveServices.java:1693)
	at com.android.server.am.ActiveServices.killServicesLocked(ActiveServices.java:2028)
	at com.android.server.am.ActivityManagerService.cleanUpApplicationRecordLocked(ActivityManagerService.java:12424)
	at com.android.server.am.ActivityManagerService.handleAppDiedLocked(ActivityManagerService.java:3605)
	at com.android.server.am.ActivityManagerService.appDiedLocked(ActivityManagerService.java:3750)
	at com.android.server.am.ActivityManagerService$AppDeathRecipient.binderDied(ActivityManagerService.java:1026)
	at android.os.BinderProxy.sendDeathNotice(Binder.java:493)
	at dalvik.system.NativeStart.run(Native Method)

Change-Id: I25a3fb678b5365254490cd5509b558348655b589
2013-11-11 10:55:42 -08:00
The Android Automerger
7917ff3076 merge in klp-mr1-release history after reset to klp-dev 2013-11-11 10:50:22 -08:00
Jeff Brown
02b7757551 am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev
* commit '1cdbbb1e73bff05f5dd1679bae2e3502d4f82368':
  Changes to support new screen cast settings screen.
2013-11-11 10:21:58 -08:00
Jeff Brown
1cdbbb1e73 Merge "Changes to support new screen cast settings screen." into klp-dev 2013-11-11 18:19:26 +00:00
Craig Mautner
86b06976e7 am 45bf2815: Merge "Fix a couple of issues with mOpeningApps." into klp-dev
* commit '45bf2815158cb98130fff120b34ad05f5a54b8f8':
  Fix a couple of issues with mOpeningApps.
2013-11-11 10:04:46 -08:00
Craig Mautner
22a9710608 am 8cfa6d08: Merge "Use old task info when creating new task." into klp-dev
* commit '8cfa6d083bc5638801fa6d1b2dfccbc460c88bb9':
  Use old task info when creating new task.
2013-11-11 10:04:43 -08:00
Craig Mautner
45bf281515 Merge "Fix a couple of issues with mOpeningApps." into klp-dev 2013-11-11 18:02:08 +00:00
Craig Mautner
8cfa6d083b Merge "Use old task info when creating new task." into klp-dev 2013-11-11 18:01:36 +00:00
Baligh Uddin
e7e1a20e02 Import translations. DO NOT MERGE
Change-Id: I78f1c240c242ca7f9b4e52503e65a991460de62e
Auto-generated-cl: translation import
2013-11-11 08:56:43 -08:00
Baligh Uddin
8a56d180fb Import translations. DO NOT MERGE
Change-Id: Ie2f34cfeb48a5d7762fc3d63be02267ce37d45d0
Auto-generated-cl: translation import
2013-11-11 08:22:01 -08:00