OSDN Git Service
Jeff Sharkey [Mon, 11 Nov 2013 23:22:37 +0000 (15:22 -0800)]
am
34163e82: am
55d12486: Merge "Give storage provider access to secondary devices." into klp-dev
* commit '
34163e8259db8661afbb267e3b899b64f429bcb7':
Give storage provider access to secondary devices.
Jeff Sharkey [Mon, 11 Nov 2013 23:19:44 +0000 (15:19 -0800)]
am
55d12486: Merge "Give storage provider access to secondary devices." into klp-dev
* commit '
55d12486df5e801dc8e74d96abdf87a250bc0ba1':
Give storage provider access to secondary devices.
Jeff Sharkey [Mon, 11 Nov 2013 23:16:38 +0000 (23:16 +0000)]
Merge "Give storage provider access to secondary devices." into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:45:05 +0000 (14:45 -0800)]
am
6164b166: (-s ours) am
840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6164b1666b571905dd313e542ceb9adcaf6e6803':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:45:02 +0000 (14:45 -0800)]
am
4f2ff756: (-s ours) am
082c7dbc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4f2ff756e169984abf955fc02e060b681d1f0f20':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:44:58 +0000 (14:44 -0800)]
am
17d19c27: (-s ours) am
c0c41cbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
17d19c27c00e6774c14ec45084dee988f59f6f0b':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:14 +0000 (14:41 -0800)]
am
840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
840587b309d52d31f9b4f3dc6e709145a9c96d6d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:12 +0000 (14:41 -0800)]
am
082c7dbc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
082c7dbc02962b321d6d6efddd683d056579b29d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:09 +0000 (14:41 -0800)]
am
c0c41cbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c0c41cbee8c8cee2639bdb63860c378d6522feaa':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:39:34 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:39:20 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 22:39:03 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Jeff Sharkey [Mon, 11 Nov 2013 22:36:33 +0000 (14:36 -0800)]
Give storage provider access to secondary devices.
Bug:
11411460
Change-Id: I3827ed5b859a68c60742a27917459e8df2c276bb
Dianne Hackborn [Mon, 11 Nov 2013 19:37:19 +0000 (11:37 -0800)]
am
7e40e317: am
c85a1143: Merge "Fix issue #
11630188: Still seeing some processes not on LRU list errors" into klp-dev
* commit '
7e40e3176399e0609051e5f0bfcb5149e78c2ea6':
Fix issue #
11630188: Still seeing some processes not on LRU list errors
Dianne Hackborn [Mon, 11 Nov 2013 19:33:38 +0000 (11:33 -0800)]
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
Dianne Hackborn [Mon, 11 Nov 2013 19:31:59 +0000 (19:31 +0000)]
Merge "Fix issue #
11630188: Still seeing some processes not on LRU list errors" into klp-dev
Dianne Hackborn [Mon, 11 Nov 2013 18:43:38 +0000 (10:43 -0800)]
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
Jeff Brown [Mon, 11 Nov 2013 18:23:57 +0000 (10:23 -0800)]
am
02b77575: am
1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev
* commit '
02b775755105a956456cb193b60d765e1a4690b6':
Changes to support new screen cast settings screen.
Jeff Brown [Mon, 11 Nov 2013 18:21:58 +0000 (10:21 -0800)]
am
1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev
* commit '
1cdbbb1e73bff05f5dd1679bae2e3502d4f82368':
Changes to support new screen cast settings screen.
Jeff Brown [Mon, 11 Nov 2013 18:19:25 +0000 (18:19 +0000)]
Merge "Changes to support new screen cast settings screen." into klp-dev
Craig Mautner [Mon, 11 Nov 2013 18:07:25 +0000 (10:07 -0800)]
am
86b06976: am
45bf2815: Merge "Fix a couple of issues with mOpeningApps." into klp-dev
* commit '
86b06976e7d93772422c85c15d08ec1f00ebbcfc':
Fix a couple of issues with mOpeningApps.
Craig Mautner [Mon, 11 Nov 2013 18:07:21 +0000 (10:07 -0800)]
am
22a97106: am
8cfa6d08: Merge "Use old task info when creating new task." into klp-dev
* commit '
22a9710608d47747f9b834aa2a6b377bf529ad33':
Use old task info when creating new task.
Craig Mautner [Mon, 11 Nov 2013 18:04:46 +0000 (10:04 -0800)]
am
45bf2815: Merge "Fix a couple of issues with mOpeningApps." into klp-dev
* commit '
45bf2815158cb98130fff120b34ad05f5a54b8f8':
Fix a couple of issues with mOpeningApps.
Craig Mautner [Mon, 11 Nov 2013 18:04:43 +0000 (10:04 -0800)]
am
8cfa6d08: Merge "Use old task info when creating new task." into klp-dev
* commit '
8cfa6d083bc5638801fa6d1b2dfccbc460c88bb9':
Use old task info when creating new task.
Craig Mautner [Mon, 11 Nov 2013 18:02:08 +0000 (18:02 +0000)]
Merge "Fix a couple of issues with mOpeningApps." into klp-dev
Craig Mautner [Mon, 11 Nov 2013 18:01:36 +0000 (18:01 +0000)]
Merge "Use old task info when creating new task." into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 16:56:43 +0000 (08:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I78f1c240c242ca7f9b4e52503e65a991460de62e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 11 Nov 2013 16:22:01 +0000 (08:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie2f34cfeb48a5d7762fc3d63be02267ce37d45d0
Auto-generated-cl: translation import
Baligh Uddin [Mon, 11 Nov 2013 16:11:33 +0000 (08:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I75eb5e47f9851174f7bd7e8301537bf7c94a8b5a
Auto-generated-cl: translation import
Deepanshu Gupta [Mon, 11 Nov 2013 06:54:13 +0000 (22:54 -0800)]
am
76b715e5: am
e45d8b2d: Merge "Fix text size in Fake Action Bar" into klp-dev
* commit '
76b715e556a110d4aa1fec0d4de195e18def8295':
Fix text size in Fake Action Bar
Deepanshu Gupta [Mon, 11 Nov 2013 06:51:26 +0000 (22:51 -0800)]
am
e45d8b2d: Merge "Fix text size in Fake Action Bar" into klp-dev
* commit '
e45d8b2dab33de18bef5cc5ae7db37b890b22d8d':
Fix text size in Fake Action Bar
Jeff Brown [Mon, 11 Nov 2013 02:54:03 +0000 (18:54 -0800)]
Changes to support new screen cast settings screen.
Fixed the Preference ordering code to consider the case where
two preferences might have the same order. In that case, it
falls back on the title to disambiguate. Previous behavior was
undefined (and technically not stable).
Expose the wifi display device address.
Perform wifi display scans every 10 seconds instead of every 15
to improve reponsiveness.
Make sure to define routes for wifi displays that we are connecting
to even if they are not yet paired. Simplified the logic for
adding and removing these routes to avoid possibly getting out
of sync and leaving stale routes behind.
Fix wifi display notification icon.
Bug:
11257292
Change-Id: I8ac15fb17d83758c0bdce80399e12723c367b83c
Deepanshu Gupta [Mon, 11 Nov 2013 06:48:30 +0000 (06:48 +0000)]
Merge "Fix text size in Fake Action Bar" into klp-dev
Jeff Brown [Mon, 11 Nov 2013 06:04:54 +0000 (22:04 -0800)]
am
5773f724: am
dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev
* commit '
5773f72457246e437c24624cda8ec2a869165ee8':
Update the media router dialogs and integrate into system UI.
Jeff Brown [Mon, 11 Nov 2013 06:04:51 +0000 (22:04 -0800)]
am
3105b6d2: am
12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '
3105b6d2f192fc25f57911ef7bafbd62bae5b7e3':
Make quick settings show the standard media router icon.
Jeff Brown [Mon, 11 Nov 2013 06:02:23 +0000 (22:02 -0800)]
am
dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev
* commit '
dd4f9e8b61c0a5639aa82480b7fdd760a2ed609c':
Update the media router dialogs and integrate into system UI.
Jeff Brown [Mon, 11 Nov 2013 06:02:20 +0000 (22:02 -0800)]
am
12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '
12c32b4d484cc7cc2278a76c6e0fc2304a74b593':
Make quick settings show the standard media router icon.
Jeff Brown [Mon, 11 Nov 2013 05:59:37 +0000 (05:59 +0000)]
Merge "Update the media router dialogs and integrate into system UI." into klp-dev
Jeff Brown [Mon, 11 Nov 2013 05:59:28 +0000 (05:59 +0000)]
Merge "Make quick settings show the standard media router icon." into klp-dev
Chong Zhang [Mon, 11 Nov 2013 05:44:42 +0000 (21:44 -0800)]
am
f32962a8: am
e8d0fbf2: Merge "Fixed a bug updating presentation displays." into klp-dev
* commit '
f32962a878d8434a9c440576af79350ddb3dc2f6':
Fixed a bug updating presentation displays.
Chong Zhang [Mon, 11 Nov 2013 05:42:23 +0000 (21:42 -0800)]
am
e8d0fbf2: Merge "Fixed a bug updating presentation displays." into klp-dev
* commit '
e8d0fbf2408d4ce905a0a6cfaf28ea00356fb0a3':
Fixed a bug updating presentation displays.
Chong Zhang [Mon, 11 Nov 2013 05:41:06 +0000 (05:41 +0000)]
Merge "Fixed a bug updating presentation displays." into klp-dev
Craig Mautner [Mon, 11 Nov 2013 04:39:05 +0000 (20:39 -0800)]
Use old task info when creating new task.
When a new task is being created solely to protect the system from an
old task going away, save the info from the old task and use it when
creating a new task.
Fixes bug
11615548.
Change-Id: Ibc3fd15ec4b0d76bce30381fbd83b6899f6a9023
Sonia Sharma [Mon, 11 Nov 2013 03:26:56 +0000 (19:26 -0800)]
am
a877cbcc: am
26f54442: Merge "Remove TMobile Tethering APN from default builds" into klp-dev
* commit '
a877cbcc411804097e99f6633d3c0a7e4e1ad249':
Remove TMobile Tethering APN from default builds
Sonia Sharma [Mon, 11 Nov 2013 03:24:11 +0000 (19:24 -0800)]
am
26f54442: Merge "Remove TMobile Tethering APN from default builds" into klp-dev
* commit '
26f54442a4e29affe785048373fffc51c4db4e4c':
Remove TMobile Tethering APN from default builds
Sonia Sharma [Mon, 11 Nov 2013 03:21:31 +0000 (03:21 +0000)]
Merge "Remove TMobile Tethering APN from default builds" into klp-dev
Dirk Dougherty [Mon, 11 Nov 2013 02:16:58 +0000 (18:16 -0800)]
am
8ede85d2: am
2705c8ba: Doc change: edits to RTL support descriptions.
* commit '
8ede85d29783b96700d8e84cd73c3002e75a7b52':
Doc change: edits to RTL support descriptions.
Dirk Dougherty [Mon, 11 Nov 2013 02:14:06 +0000 (02:14 +0000)]
am
2705c8ba: Doc change: edits to RTL support descriptions.
* commit '
2705c8ba678e61030a36556125a57d272631d181':
Doc change: edits to RTL support descriptions.
Dirk Dougherty [Mon, 11 Nov 2013 02:07:24 +0000 (18:07 -0800)]
Doc change: edits to RTL support descriptions.
Change-Id: I90317c55f4bc34b087b1c374c7b72363b9afadef
Dirk Dougherty [Mon, 11 Nov 2013 01:54:53 +0000 (17:54 -0800)]
am
fca02914: am
d296e25a: eoc change: Add developer stories for localization.
* commit '
fca029143e4f6476f401e8beea529a0a8890574b':
eoc change: Add developer stories for localization.
Dirk Dougherty [Mon, 11 Nov 2013 01:51:57 +0000 (01:51 +0000)]
am
d296e25a: eoc change: Add developer stories for localization.
* commit '
d296e25a329b7251c89c85dec836878f4c03a4ec':
eoc change: Add developer stories for localization.
Dirk Dougherty [Wed, 6 Nov 2013 22:33:01 +0000 (14:33 -0800)]
eoc change: Add developer stories for localization.
Change-Id: Ia89bddf9d57674272dbcef98a140b557e520e8be
Jeff Brown [Sun, 10 Nov 2013 01:48:23 +0000 (17:48 -0800)]
Update the media router dialogs and integrate into system UI.
Port the new style UI back into the framework from the support library.
There are now two dialogs: a chooser and a controller. We use the
same dialogs for selecting routes within app and within quick settings.
Note that the new UI does not support any grouping features since they
are deprecated and unused.
Bug:
11257292
Change-Id: I64e936a18d25ab75f0c470cbc1e7085f67004863
Jeff Brown [Fri, 8 Nov 2013 21:55:55 +0000 (13:55 -0800)]
Make quick settings show the standard media router icon.
Fixed a bug in ImageView where we failed to inform a newly updated
Drawable about the visibility state. This caused AnimationDrawables
to not animate when attached to an existing ImageView *unless* that
ImageView happened to be attached to the window *later* or have
its visibility toggled for some other reason.
Bug:
11257292
Change-Id: Iba9e0db5ba0db2b022950aec0c6f60a435da8ad2
Robert Greenwalt [Sat, 9 Nov 2013 03:35:50 +0000 (19:35 -0800)]
Remove TMobile Tethering APN from default builds
bug:
11383698
Change-Id: I037b42a85851e2cf14afdd30c6604e6b9586bc80
Chong Zhang [Fri, 8 Nov 2013 17:46:24 +0000 (09:46 -0800)]
Fixed a bug updating presentation displays.
Also made findRemoteDisplay public.
Bug:
11257292
Change-Id: Ibc9bf3d8ee7c90293ffd8796270e8883ea458a65
Jim Miller [Sat, 9 Nov 2013 00:27:38 +0000 (16:27 -0800)]
am
01edb226: am
ed7376fc: Merge "Restore permission check in keyguard." into klp-dev
* commit '
01edb22617a96502dfb5297eff1cdf5f265299e2':
Restore permission check in keyguard.
Jim Miller [Sat, 9 Nov 2013 00:25:06 +0000 (16:25 -0800)]
am
ed7376fc: Merge "Restore permission check in keyguard." into klp-dev
* commit '
ed7376fc4829e93f5f2d3037633a37d652a13a7c':
Restore permission check in keyguard.
Jim Miller [Sat, 9 Nov 2013 00:22:07 +0000 (00:22 +0000)]
Merge "Restore permission check in keyguard." into klp-dev
Craig Mautner [Fri, 8 Nov 2013 23:24:22 +0000 (15:24 -0800)]
Fix a couple of issues with mOpeningApps.
In setAppVisibility add wtoken to mOpeningApps even if the requested
visibility already matches requestedHidden. When Keyguard hides an app
requestedHidden will mismatch and mOpeningApps will end up empty where
it should have the app that will become visible.
Add mAnimateWallpaperWithTarget = true to another situation where
wallpaper animation needs it.
Fixes bug
11570753.
Change-Id: I70b93bbb580386eb912613f0ce11e582eff8c449
John Spurlock [Fri, 8 Nov 2013 23:05:32 +0000 (15:05 -0800)]
am
575d07ed: am
105b9b05: Merge "Avoid unnecessary ticker animation if already visible." into klp-dev
* commit '
575d07ed54514958caf80d64e0503c55abdf2577':
Avoid unnecessary ticker animation if already visible.
John Spurlock [Fri, 8 Nov 2013 23:02:35 +0000 (15:02 -0800)]
am
105b9b05: Merge "Avoid unnecessary ticker animation if already visible." into klp-dev
* commit '
105b9b05041ea6f1109d961d548f3dde2bd69501':
Avoid unnecessary ticker animation if already visible.
John Spurlock [Fri, 8 Nov 2013 23:00:30 +0000 (23:00 +0000)]
Merge "Avoid unnecessary ticker animation if already visible." into klp-dev
Jim Miller [Fri, 8 Nov 2013 21:25:36 +0000 (13:25 -0800)]
Restore permission check in keyguard.
Fixes bug
11584685
Change-Id: I80621f5608505bdc365930e0276c297c0d5bff67
John Spurlock [Fri, 8 Nov 2013 21:56:54 +0000 (16:56 -0500)]
Avoid unnecessary ticker animation if already visible.
When ticker disabled (e.g. on lockscreen) we should avoid
animating on halt if already halted.
Bug:
11033324
Change-Id: Id2927d66492a128928b80ff98dc9182209be0652
Ed Heyl [Fri, 8 Nov 2013 21:59:54 +0000 (13:59 -0800)]
am
3f257f9f: am
a5c5fa30: merge in release branch changes (no-op).
* commit '
3f257f9faca86b9e6b65fa6a2f9f5b5785d8a26e':
Fix issue #
11223338: Not retaining service started state while restarting
Improve RTL support for Immersive mode
Fix bug #
11537133 Hideycling looks broken (KOT36), missing left padding
Christopher Tate [Fri, 8 Nov 2013 21:35:48 +0000 (13:35 -0800)]
am
b9971731: am
70849dd3: am
5d515f26: am
fd706246: am
562fddce: am
05e3f55f: am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
b9971731391343055412120293e6741bc2d5f533':
System package permission decls take precedence over 3rd party apps'
Ed Heyl [Fri, 8 Nov 2013 21:31:31 +0000 (13:31 -0800)]
am
a5c5fa30: merge in release branch changes (no-op).
* commit '
a5c5fa308918791a76a149e0768c8cbfc18d1778':
Fix issue #
11223338: Not retaining service started state while restarting
Improve RTL support for Immersive mode
Fix bug #
11537133 Hideycling looks broken (KOT36), missing left padding
Ed Heyl [Fri, 8 Nov 2013 21:23:49 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
Christopher Tate [Fri, 8 Nov 2013 21:01:14 +0000 (13:01 -0800)]
am
70849dd3: am
5d515f26: am
fd706246: am
562fddce: am
05e3f55f: am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
70849dd3285f16d79d2f65491489ed445bf610c9':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:57:49 +0000 (12:57 -0800)]
am
5d515f26: am
fd706246: am
562fddce: am
05e3f55f: am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
5d515f269b155c8e98ef5c0f8057feb41310f80f':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:56:07 +0000 (12:56 -0800)]
am
fd706246: am
562fddce: am
05e3f55f: am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
fd70624629c42b0e0444a4d99ba64d58551fa6b0':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:51:56 +0000 (12:51 -0800)]
am
562fddce: am
05e3f55f: am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
562fddce2f154f8adec91cc8a4c4ef1fb4eabcfe':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:47:43 +0000 (12:47 -0800)]
am
05e3f55f: am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
05e3f55f17e36b415a23095dbeaa1d04716aed5a':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:45:38 +0000 (12:45 -0800)]
am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
1d8f592a752c30534a6e03889f1ba42b232770ef':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:41:57 +0000 (12:41 -0800)]
am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
ef12b1d4a9ba6a91b61647feadaf2c4cdf34c356':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:37:43 +0000 (12:37 -0800)]
am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
ea198841a9e64d72de49811e0e2c555eb2c40b9b':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:36:05 +0000 (12:36 -0800)]
am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
ef4694cbdd2e374e063d5d89bcb7c4b041c20a30':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:34:13 +0000 (12:34 -0800)]
am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
ae229d991711745bdf8da2e716c31efde534e6da':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:31:09 +0000 (12:31 -0800)]
am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
43253333d24e856a7ffef818fdfaedf3fd60d3b6':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:27:10 +0000 (12:27 -0800)]
am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
50cbfd554f0bdf05c701d8baf15c862fbb8a6dc0':
System package permission decls take precedence over 3rd party apps'
Glenn Kasten [Fri, 8 Nov 2013 19:54:54 +0000 (11:54 -0800)]
am
744cdf57: am
b6d3c1ce: Merge "Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)" into klp-dev
* commit '
744cdf57e60aadc697ecc12effda789482b96982':
Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)
Jim Miller [Fri, 8 Nov 2013 19:35:18 +0000 (11:35 -0800)]
am
44ee0fb1: am
c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev
* commit '
44ee0fb144947206713e6527a5227fd44e2d4e1e':
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
Glenn Kasten [Fri, 8 Nov 2013 19:20:30 +0000 (11:20 -0800)]
am
b6d3c1ce: Merge "Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)" into klp-dev
* commit '
b6d3c1cecadb50263c2682a89f9f0b2936bfcd19':
Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)
Glenn Kasten [Fri, 8 Nov 2013 19:18:32 +0000 (19:18 +0000)]
Merge "Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)" into klp-dev
Jeff Brown [Fri, 8 Nov 2013 19:16:17 +0000 (11:16 -0800)]
am
ca39478f: am
f99b017e: Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev
* commit '
ca39478f33977ba6ba278fb9e3913144d7a5d0c2':
Allow keyguard dialogs to show on secondary displays.
Ruben Brunk [Fri, 8 Nov 2013 19:16:12 +0000 (11:16 -0800)]
am
70285910: am
e73b41b2: camera2: Remove prior repeating request when setting.
* commit '
70285910ab43edc27c86783e4c97a1a3c9d914c5':
camera2: Remove prior repeating request when setting.
Jim Miller [Fri, 8 Nov 2013 19:01:57 +0000 (11:01 -0800)]
am
c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev
* commit '
c55edb266f96364277b4a3552295c94363d847fb':
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
Jim Miller [Fri, 8 Nov 2013 18:58:04 +0000 (18:58 +0000)]
Merge changes I74bfc0d5,I577f9d36 into klp-dev
* changes:
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
Jeff Brown [Fri, 8 Nov 2013 18:56:23 +0000 (10:56 -0800)]
am
f99b017e: Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev
* commit '
f99b017e9c00be55c0063e9b7c1329b35ab564ed':
Allow keyguard dialogs to show on secondary displays.
Jeff Brown [Fri, 8 Nov 2013 18:53:41 +0000 (18:53 +0000)]
Merge "Allow keyguard dialogs to show on secondary displays." into klp-dev
Ruben Brunk [Fri, 8 Nov 2013 18:06:32 +0000 (10:06 -0800)]
am
e73b41b2: camera2: Remove prior repeating request when setting.
* commit '
e73b41b27f16b160cfe49bdcac3091dce94229ae':
camera2: Remove prior repeating request when setting.
Jeff Brown [Fri, 8 Nov 2013 01:58:15 +0000 (17:58 -0800)]
Allow keyguard dialogs to show on secondary displays.
When the keyguard or a dream is visible, we usually block content
from showing on secondary displays by mirroring the primary display
contents to them. However, the keyguard may wish to show a
presentation on a secondary display in which case we should not
mirror.
This change adds an exemption for keyguard dialogs when the full
screen is obscured. The keyguard can then create presentations with
the TYPE_KEYGUARD_DIALOG window type in order to show special
content on other displays selectively.
The old code used to cause all secondary displays to mirror, which
isn't quite what we want.
Bug:
11257292
Change-Id: I55429002b2233ae25fe80db149636d6f41f2a112
Deepanshu Gupta [Fri, 8 Nov 2013 11:13:07 +0000 (16:43 +0530)]
Fix text size in Fake Action Bar
The density multiplier was being applied twice to the title text in
the fake action bar.
Bug:
11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
Elliott Hughes [Fri, 8 Nov 2013 07:05:33 +0000 (23:05 -0800)]
am
ede7f9d3: am
9e71310d: Merge "Remove incorrect (and unused) capget code."
* commit '
ede7f9d3a39d87f12d58df495f28108784e9b588':
Remove incorrect (and unused) capget code.
Elliott Hughes [Fri, 8 Nov 2013 07:03:43 +0000 (23:03 -0800)]
am
9e71310d: Merge "Remove incorrect (and unused) capget code."
* commit '
9e71310d15d9dfcbf5e1c94948e0260f3dc3e678':
Remove incorrect (and unused) capget code.
Elliott Hughes [Fri, 8 Nov 2013 07:01:43 +0000 (07:01 +0000)]
Merge "Remove incorrect (and unused) capget code."
Elliott Hughes [Fri, 8 Nov 2013 01:21:03 +0000 (17:21 -0800)]
Remove incorrect (and unused) capget code.
Note that if you revert this change, the code it removes is incorrect,
and doesn't handle the top 32 bits of capabilities, one of which we're
already using: CAP_BLOCK_SUSPEND.
Bug:
11508244
Change-Id: Ice1f51334bce4941c6d24d6016450a2ebcf92886
Ruben Brunk [Fri, 8 Nov 2013 03:30:43 +0000 (19:30 -0800)]
camera2: Remove prior repeating request when setting.
Bug:
11579778
Change-Id: Idb10662413ff5ee939adbdeab68a97cb34750fac
Jim Miller [Fri, 8 Nov 2013 03:15:49 +0000 (19:15 -0800)]
Delay tearing down external displays until keyguard finishes
This waits until the keyguard window is actually removed before turning
off external presentations to avoid flashing the user's password.
Fixes bug
11562369
Change-Id: I74bfc0d5e23dccc5a8628abfe02868c71c371f6e
OSDN Git Service
