OSDN Git Service
RoboErik [Wed, 27 Aug 2014 23:03:19 +0000 (16:03 -0700)]
Update to MediaBrowser APIs per council feedback
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.
bug:
17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
George Mount [Thu, 28 Aug 2014 18:05:39 +0000 (18:05 +0000)]
Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev
George Mount [Thu, 28 Aug 2014 18:02:26 +0000 (18:02 +0000)]
Merge "Allow arbitrarily-added shared elements." into lmp-dev
Nancy Chen [Thu, 28 Aug 2014 17:55:49 +0000 (17:55 +0000)]
Merge "Add field for sub_id in call log for sprout database." into lmp-dev
Jose Lima [Thu, 28 Aug 2014 17:49:31 +0000 (17:49 +0000)]
Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev
Yigit Boyar [Thu, 28 Aug 2014 17:33:36 +0000 (17:33 +0000)]
Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev
Chris Craik [Thu, 28 Aug 2014 17:27:23 +0000 (17:27 +0000)]
Merge "Update transform isolation to handle command chunks" into lmp-dev
John Reck [Thu, 28 Aug 2014 17:13:23 +0000 (17:13 +0000)]
Merge "Fix log line" into lmp-dev
John Reck [Thu, 28 Aug 2014 16:56:20 +0000 (09:56 -0700)]
Fix log line
Change-Id: I290491f559281c7b3d1d132495ea2fffcfaf4725
John Spurlock [Thu, 28 Aug 2014 16:50:08 +0000 (16:50 +0000)]
Merge "Enhance audio service dumpsys." into lmp-dev
John Reck [Thu, 28 Aug 2014 16:48:03 +0000 (16:48 +0000)]
Merge "Actually end animators on tree destruction" into lmp-dev
Chet Haase [Thu, 28 Aug 2014 16:42:26 +0000 (16:42 +0000)]
Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev
Robert Greenwalt [Thu, 28 Aug 2014 16:29:55 +0000 (16:29 +0000)]
Merge "Clean up Connectivity Logging." into lmp-dev
John Spurlock [Tue, 26 Aug 2014 20:40:35 +0000 (16:40 -0400)]
Enhance audio service dumpsys.
- Add device name for keys
- Add max volume for streams
- Add missing stream name constant
Bug:
16964015
Change-Id: I92facbd8ae49ba299c27bcb10bcf6668fed0d302
Robin Lee [Thu, 28 Aug 2014 16:12:59 +0000 (16:12 +0000)]
Merge "Relocate broken getCallingUserId() calls" into lmp-dev
Jeff Sharkey [Thu, 28 Aug 2014 16:12:46 +0000 (16:12 +0000)]
Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev
Robin Lee [Thu, 28 Aug 2014 15:56:15 +0000 (16:56 +0100)]
Relocate broken getCallingUserId() calls
This should not be invoked while the calling identity is cleared
because it will return the current user rather than the calling user.
Bug:
17314802
Change-Id: I587daa420b0976d41928ab7c34eeda2329c1341e
Nancy Chen [Thu, 28 Aug 2014 01:29:59 +0000 (18:29 -0700)]
Add field for sub_id in call log for sprout database.
Adding sub_id as a column in the calls table to make the sprout and
non-sprout contacts databases consistent.
Bug:
14990572
Change-Id: I82d9fe65e6cdf4e10b6115a8565c2be3a6f93562
Jae Seo [Thu, 28 Aug 2014 15:45:00 +0000 (15:45 +0000)]
Merge "Start TvInputManagerService when the device supports FEATURE_LIVE_TV" into lmp-dev
John Reck [Thu, 28 Aug 2014 15:43:39 +0000 (08:43 -0700)]
Actually end animators on tree destruction
Bug:
17313962
Change-Id: I66b86d50b415f9aa33da23297f22e2cf7f96f565
Chet Haase [Thu, 28 Aug 2014 14:53:59 +0000 (07:53 -0700)]
Canceling ViewPropertyAnimator now removes pending actions
Normally, calling cancel() on ViewPropertyAnimator() will cancel any
running animations as well as any associated actions (layers and
start/end actions). But if the animation is canceled before the first
frame, these other actions are still pending and will not be canceled.
This fix also cancels these pending actions.
Issue #
17296082 VPA.cancel() doesn't clear the end action
Change-Id: If104d21c1e2d64516500048a06ba217284732ef0
Selim Cinek [Thu, 28 Aug 2014 13:37:21 +0000 (13:37 +0000)]
Merge "Fixed a flash of the preview image when going to the dialer" into lmp-dev
Selim Cinek [Thu, 28 Aug 2014 13:35:59 +0000 (13:35 +0000)]
Merge "Fixed a bug where notifications could remain in the overlay." into lmp-dev
John Spurlock [Thu, 28 Aug 2014 13:30:13 +0000 (13:30 +0000)]
Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
Lajos Molnar [Thu, 28 Aug 2014 13:28:50 +0000 (13:28 +0000)]
Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev
Selim Cinek [Thu, 28 Aug 2014 12:51:05 +0000 (14:51 +0200)]
Fixed a flash of the preview image when going to the dialer
The preview image was animating even though it should not have
leading to a weird flash.
Bug:
17261091
Change-Id: I168eae25eb654ceb79e055fb0d0189c31cb0bb3d
Selim Cinek [Thu, 28 Aug 2014 12:30:12 +0000 (14:30 +0200)]
Fixed a bug where notifications could remain in the overlay.
This led to notifications being visible even though they should
have been removed
Bug:
17295716
Change-Id: I05a243d5c9ca359d1f5ca29a7535935d6e61a4d6
Selim Cinek [Wed, 27 Aug 2014 10:51:45 +0000 (12:51 +0200)]
Added a warning when the profile has an owner
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.
Bug:
17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
Dan Sandler [Thu, 28 Aug 2014 12:49:24 +0000 (12:49 +0000)]
Merge "Update soundscape for L, using classic names." into lmp-dev
Jorim Jaggi [Wed, 27 Aug 2014 15:52:46 +0000 (17:52 +0200)]
Start intent chooser after Keyguard is gone
If we have an intent chooser on the camera intent, we need to launch
it after the Keyguard is fully gone because the ResolveActivity would
finish itself if it is launched behind the Keyguard.
Bug:
16570873
Change-Id: I2fdb4975fa0a6510e8853c6042383089570ec1f5
Jorim Jaggi [Thu, 28 Aug 2014 10:57:44 +0000 (10:57 +0000)]
Merge "Fix large text setting for QS" into lmp-dev
Jorim Jaggi [Tue, 26 Aug 2014 15:27:31 +0000 (17:27 +0200)]
Fix large text setting for QS
Bug:
15591223
Change-Id: I9f514a4970edbda778b987dfc3eca3914e492011
Jorim Jaggi [Thu, 28 Aug 2014 10:46:36 +0000 (10:46 +0000)]
Merge "Make it possible to disable camera on lockscreen" into lmp-dev
Esteban Talavera [Wed, 27 Aug 2014 17:01:58 +0000 (18:01 +0100)]
Renamed getUninstallBlocked to isUninstallBlocked
As per API review.
Bug:
17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
Jae Seo [Thu, 28 Aug 2014 06:50:37 +0000 (23:50 -0700)]
Start TvInputManagerService when the device supports FEATURE_LIVE_TV
Bug:
17284986
Change-Id: I5efeffecfcb771cb2e6180ccfd665464611a24fc
Jose Lima [Thu, 28 Aug 2014 06:09:05 +0000 (23:09 -0700)]
Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
API review request.
Bug:
17288987
Change-Id: If63f847ce630a57e4aa1e5291befe2863cb7e0c7
Jae Seo [Thu, 28 Aug 2014 05:50:18 +0000 (05:50 +0000)]
Merge "Add android.software.live_tv feature" into lmp-dev
Jae Seo [Wed, 27 Aug 2014 22:11:12 +0000 (15:11 -0700)]
API Review: TV
This change addresses the following feedback:
- "ageHint" attribute should be renamed to "contentAgeHint"
- "country" attribute should be doc'd to specify valid formats (two
character country codes or whatever)
Bug:
17293643
Change-Id: Ia5e58e191c3678bb2d6b1be36c4275d323675ad9
Jae Seo [Mon, 25 Aug 2014 21:39:26 +0000 (14:39 -0700)]
TIF: Enable applications to register custom content rating systems
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.
Bug:
17167287, Bug:
17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
Dan Sandler [Thu, 28 Aug 2014 04:37:18 +0000 (00:37 -0400)]
Update soundscape for L, using classic names.
(partial revert of commit
7348f744)
Bug:
15725449
Change-Id: Ic1a038c906deab035f96caed42fc16c59d459965
Selim Gurun [Thu, 28 Aug 2014 01:47:30 +0000 (01:47 +0000)]
Merge "Address API Feedback" into lmp-dev
John Reck [Thu, 28 Aug 2014 01:38:57 +0000 (01:38 +0000)]
Merge "Animator stuff" into lmp-dev
Svetoslav [Thu, 28 Aug 2014 01:37:42 +0000 (01:37 +0000)]
Merge "Fix live region updates." into lmp-dev
Jinsuk Kim [Thu, 28 Aug 2014 00:59:02 +0000 (00:59 +0000)]
Merge "CEC: return non-null MHL controller when not ready" into lmp-dev
Santos Cordon [Thu, 28 Aug 2014 00:57:45 +0000 (00:57 +0000)]
Merge "Call onPhoneDestroyed when the service is unbound." into lmp-dev
Selim Gurun [Wed, 27 Aug 2014 18:22:26 +0000 (11:22 -0700)]
Address API Feedback
Bug:
17253647
This is Part I of API feedback. It does not address portions
of the feedback that is still pending a response from API council.
Change-Id: I6ae250c6455a5545912623aeb34332d564fffde7
John Reck [Thu, 14 Aug 2014 16:02:01 +0000 (09:02 -0700)]
Animator stuff
Bug:
17228458
Change-Id: Id884a429a512f9cd2be0ed16dbd0f10e92b4440d
Santos Cordon [Tue, 26 Aug 2014 16:54:33 +0000 (09:54 -0700)]
Call onPhoneDestroyed when the service is unbound.
Bug:
17253031
Change-Id: I1a74e0f2fe1ec9172268638dba531c17d22dee99
Yorke Lee [Thu, 28 Aug 2014 00:16:24 +0000 (00:16 +0000)]
Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev
Dongwon Kang [Thu, 28 Aug 2014 00:00:55 +0000 (00:00 +0000)]
Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev
Michael Wright [Thu, 28 Aug 2014 00:00:54 +0000 (00:00 +0000)]
Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev
Christopher Tate [Thu, 28 Aug 2014 00:00:46 +0000 (00:00 +0000)]
Merge "Do not require device provisioning to do restore-at-install" into lmp-dev
Yorke Lee [Wed, 27 Aug 2014 23:28:12 +0000 (16:28 -0700)]
Update value of EXTRA_CALL_TYPE_FILTER
Bug:
17253963
Change-Id: I1e98fc2a25b0bc807b0b4d1af2941da6660e09e0
Filip Gruszczynski [Wed, 27 Aug 2014 23:21:37 +0000 (23:21 +0000)]
Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev
George Mount [Wed, 27 Aug 2014 23:10:46 +0000 (16:10 -0700)]
Allow arbitrarily-added shared elements.
Bug
17112782
This allows the application developer to set any view as
a shared element so that it will avoid the enter and/or exit
transition. This will allow it to be transitioned along with
the shared element transition as well. It will also allow
the called Activity to return different shared elements than
those passed in.
Change-Id: I7b1f4f029af50dc6e2d5f025062b5669486f6427
Chris Craik [Wed, 27 Aug 2014 22:34:52 +0000 (15:34 -0700)]
Update transform isolation to handle command chunks
bug:
15570351
Prevent drawing transformations on a ViewGroup's canvas from directly
affecting the transformation of the children through the renderer,
since it's already baked into mTransformFromParent at record time.
Change-Id: I6310a2260dfe4def0bde1fd2c5b93791a645d586
Filip Gruszczynski [Tue, 26 Aug 2014 00:05:11 +0000 (17:05 -0700)]
Allowing isRound and outsetBottom properties to be passed to ActivityView.
We remove requirement for having display id == 0 or allow circumventing it
through a flag.
Change-Id: Ia4671614b51894393d47e681cc72718d394230f6
Michael Wright [Wed, 27 Aug 2014 22:36:15 +0000 (15:36 -0700)]
Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
Also add docs to PowerManager.WakeLock#release(int)
Bug:
17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
Alan Viverette [Wed, 27 Aug 2014 22:29:19 +0000 (22:29 +0000)]
Merge "Preserve inner drawable bounds and level on mutate" into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 21:46:32 +0000 (14:46 -0700)]
Define EXTRA_SIZE for ContentProviders.
Also make Size and SizeF parcelable.
Bug:
17205016
Change-Id: Ide397b84864f6cad7f8d89e66b6c8697a3ad335b
Tim Kilbourn [Wed, 27 Aug 2014 22:07:35 +0000 (22:07 +0000)]
Merge "Update leanback shadow parameters." into lmp-dev
Robert Greenwalt [Wed, 27 Aug 2014 21:34:02 +0000 (14:34 -0700)]
Clean up Connectivity Logging.
bug:
17285109
Change-Id: I61b98aa636996f8d4915fd954d49a22c20cfe9ab
Eric Laurent [Wed, 27 Aug 2014 21:47:09 +0000 (21:47 +0000)]
Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev
John Spurlock [Wed, 27 Aug 2014 21:46:03 +0000 (17:46 -0400)]
Zen: Remove alarm warnings, color the subhead instead.
- When selecting "None" in the dialog, remove the footer warnings
about alarms, and associated bits.
- Update subhead text for "None".
- Keep track of how often "None" is used (defined as a user change
during a visible dialog session) and color the subhead text
with the warning color until it's been used five times.
Bug:
17283115
Change-Id: Ief8a1c557716ec2f581b8338511432d17ac0d371
Lajos Molnar [Fri, 22 Aug 2014 22:51:40 +0000 (15:51 -0700)]
media: update MediaCodec/Info/List/Format APIs based on review comments
Bug:
17059255
Change-Id: Ifbba2a0799e7db5ae48190ba6b1e4ba13fffa167
Jim Miller [Wed, 27 Aug 2014 21:29:11 +0000 (21:29 +0000)]
Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev
Jim Miller [Wed, 27 Aug 2014 01:42:58 +0000 (18:42 -0700)]
Hide trust agent whitelisting until new API is ready.
Fixes bug
17008504
Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
Sascha Prueter [Wed, 27 Aug 2014 21:18:33 +0000 (21:18 +0000)]
Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev
Michael Wright [Wed, 27 Aug 2014 21:16:32 +0000 (21:16 +0000)]
Merge "Allow voice assist to function in a non-interactive state" into lmp-dev
Jae Seo [Wed, 27 Aug 2014 21:02:15 +0000 (14:02 -0700)]
Add android.software.live_tv feature
This feature will be listed by Android TV devices that allow displaying
contents from TV inputs implemented with the
android.media.tv.TvInputService API. (Note that not all leanback devices
support this feature.)
Bug:
17284986
Change-Id: Ic1f23f6f5955866e9f1db9229693d370576066a3
Craig Mautner [Wed, 27 Aug 2014 21:01:25 +0000 (14:01 -0700)]
Add null check to cleanupRecentTasksLocked.
If during boot, the package manager broadcast occurs before
TaskPersister has restored the recents list then mRecentTasks will be
null and an NPE will occur. This checks for null mRecentsTasks and
returns before the NPE happens.
Fixes bug
17300409.
Change-Id: I1588ad3a3c0d04bc6f273630ef5dadf6821e5710
Christopher Tate [Wed, 27 Aug 2014 20:54:51 +0000 (13:54 -0700)]
Do not require device provisioning to do restore-at-install
Provisioning is a milestone used for gating *backup* operation,
but it's important that restores be possible during the setup
process. In particular, some applications such as home apps may
be deliberately pushed for install after platform restore, but
before the end of the setup process. We need to be able to do
install-time restores of such apps.
Bug
17288313
Change-Id: Iaff5d9919e6392b2ca5925be4d63a4116cd11f77
Tim Kilbourn [Wed, 27 Aug 2014 20:54:00 +0000 (13:54 -0700)]
Update leanback shadow parameters.
Bug:
15859361
Change-Id: I54d184cdf72de98aa0d258774f772f874c6d0490
Jim Miller [Wed, 27 Aug 2014 20:42:18 +0000 (20:42 +0000)]
Merge "Change name of confirm credentials method after API review" into lmp-dev
Yigit Boyar [Mon, 25 Aug 2014 20:27:40 +0000 (13:27 -0700)]
Use a weak observable in AutoCompleteTextView
If adapter has longer life span than AutoCompleteTextView, it may leak
the View. This change prevents it by using a static observer with a
weak reference to the actual TextView.
Bug:
11287688
Change-Id: I2c9db94dfa1be3b3f5368406e557f3e8e34bbce9
Winson Chung [Wed, 27 Aug 2014 20:09:55 +0000 (20:09 +0000)]
Merge "Additional changes to improve performance when loading Recents. (Bug
16987565)" into lmp-dev
Alan Viverette [Wed, 27 Aug 2014 20:04:27 +0000 (20:04 +0000)]
Merge "Fix NPE in RippleDrawable" into lmp-dev
Alan Viverette [Wed, 27 Aug 2014 19:44:36 +0000 (19:44 +0000)]
Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev
Eric Laurent [Wed, 27 Aug 2014 19:36:33 +0000 (12:36 -0700)]
fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
In checkSendBecomingNoisyIntent(), only output devices
must be taken into account when checking if the device
type is in mBecomingNoisyIntentDevices
Bug:
17298383.
Bug:
16403219.
Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8
Alan Viverette [Wed, 27 Aug 2014 19:28:18 +0000 (12:28 -0700)]
Rename Spinner.Form to Spinner.Underlined, make Alert theme public
BUG:
17286794
BUG:
17295515
Change-Id: I010bb1591f7690dbc40020d3fdd413f8e1bd8547
John Spurlock [Wed, 27 Aug 2014 19:15:02 +0000 (19:15 +0000)]
Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev
Winson Chung [Tue, 26 Aug 2014 19:25:34 +0000 (12:25 -0700)]
Additional changes to improve performance when loading Recents. (Bug
16987565)
- Ensuring that we consistently load activity icon, title and color for both full and shallow stacks
- Adding activity info caches when loading the stacks
- Should not be scaling pin icon when launching from pin
- Tweaking snap-back, over scroll, and shadows
Change-Id: I556b93562bb2c69e4c25ce787a7a34532ab706ca
John Spurlock [Wed, 27 Aug 2014 18:55:54 +0000 (14:55 -0400)]
Doze: Null check in NotificationContentView.mContractedChild.
Bug:
17247547
Change-Id: Iede5d0cd88db4e293e583f3a3c324354eb6d594e
Eino-Ville Talvala [Wed, 27 Aug 2014 18:47:30 +0000 (18:47 +0000)]
Merge "Camera2: Correct error handling" into lmp-dev
Jean-Michel Trivi [Wed, 27 Aug 2014 18:23:00 +0000 (18:23 +0000)]
Merge "SoundPool.Builder: document default values" into lmp-dev
Eino-Ville Talvala [Wed, 6 Aug 2014 21:31:08 +0000 (14:31 -0700)]
Camera2: Correct error handling
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason
Bug:
17160301
Bug:
15524101
Bug:
14448494
Bug:
11272459
Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
Jeff Sharkey [Wed, 27 Aug 2014 17:58:37 +0000 (17:58 +0000)]
Merge "Recreate lib symlink after deleting app data." into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 17:58:16 +0000 (17:58 +0000)]
Merge "Clear pending operation flag when move failed." into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 17:47:19 +0000 (10:47 -0700)]
Recreate lib symlink after deleting app data.
Bug:
16739202
Change-Id: Ie8dccf67feaf6dfa474d52a3cda0862b952e6762
Alan Viverette [Wed, 27 Aug 2014 02:22:40 +0000 (19:22 -0700)]
Preserve inner drawable bounds and level on mutate
Also includes a tiny change to progress bar background alpha, which was
too dark to see.
BUG:
17285057
Change-Id: I8b0cc1c2c9405558b8163d8db9374d7c748317a2
Amith Yamasani [Wed, 27 Aug 2014 17:39:28 +0000 (17:39 +0000)]
Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev
Amith Yamasani [Wed, 27 Aug 2014 17:33:17 +0000 (10:33 -0700)]
Fix incorrect reading of multichoice app restrictions
Clear the list of choices values before putting new ones in.
Bug:
17299310
Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
Craig Mautner [Wed, 27 Aug 2014 17:29:57 +0000 (17:29 +0000)]
Merge "Revert "Debug for
13924095."" into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 17:24:59 +0000 (10:24 -0700)]
Clear pending operation flag when move failed.
Bug:
17298448
Change-Id: I7a4af0f31d3909a9bfb5a2dd7d168015786024e3
Craig Mautner [Wed, 27 Aug 2014 17:14:17 +0000 (17:14 +0000)]
Merge "When adding an apptoken skip over removed ones." into lmp-dev
Jorim Jaggi [Wed, 27 Aug 2014 17:08:26 +0000 (19:08 +0200)]
Make it possible to disable camera on lockscreen
Bug:
16807006
Change-Id: I8f439c22d481d52c7edf46d0caf78e26dfeb64e8
Craig Mautner [Wed, 27 Aug 2014 17:05:07 +0000 (17:05 +0000)]
Revert "Debug for
13924095."
This reverts commit
76309cd761a0f9d9e44435ba9a4bde8363ba9f7b.
Logspam no longer useful, just annoying now.
Change-Id: I826d383101077cc1bb341d4a3186ef98ed7e0c00
Christopher Tate [Wed, 27 Aug 2014 17:06:12 +0000 (17:06 +0000)]
Merge "Remember having done full-data as well as key/value app backups" into lmp-dev
Craig Mautner [Wed, 27 Aug 2014 16:56:02 +0000 (09:56 -0700)]
When adding an apptoken skip over removed ones.
App tokens are passed from the activity manager to the window
manager along with a list insertion position. That insertion
position presumes that all removed tokens are no longer in window
manager's list. However, when removal of a token is delayed due
to ongoing animation the insertion position was pointing to the
wrong location. This fix skips over tokens that have been marked
for removal when inserting new app tokens.
Fixes bug
15751591.
Change-Id: Ib484c591e2bba9f46ad8e47d60ef05c7bfda0a12
Julia Reynolds [Wed, 27 Aug 2014 16:49:45 +0000 (16:49 +0000)]
Merge "Limit the settings profile/device owners can update." into lmp-dev