drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
149,015 Commits 1 Branch 0 Tags
Commit Graph

149015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
cd31d5d9ae Correct misleading javadoc for BackupHelper 
Change-Id: I3865cb3bd55f04baadedb55e9f84fc516eae75b4
 2014-08-27 18:49:37 -07:00
Dongwon Kang
162fa7f41b Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 2014-08-28 00:00:58 +00:00
Michael Wright
b4558af745 Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 2014-08-28 00:00:56 +00:00
Christopher Tate
89972815a2 Merge "Do not require device provisioning to do restore-at-install" into lmp-dev 2014-08-28 00:00:48 +00:00
Filip Gruszczynski
30a480bcfc Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 2014-08-27 23:22:29 +00:00
Filip Gruszczynski
f14d924cd7 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
 2014-08-27 15:38:24 -07:00
Michael Wright
219857b900 Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY 
Also add docs to PowerManager.WakeLock#release(int)

Bug: 17290118
Change-Id: Ibcbc4279efdd0f275808042356e6ff843958e23f
 2014-08-27 15:37:27 -07:00
Alan Viverette
327710e36f Merge "Preserve inner drawable bounds and level on mutate" into lmp-dev 2014-08-27 22:29:19 +00:00
Tim Kilbourn
12ed679911 Merge "Update leanback shadow parameters." into lmp-dev 2014-08-27 22:07:37 +00:00
Eric Laurent
6c104d84c3 Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 2014-08-27 21:47:11 +00:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00
Jim Miller
b1474f4432 Hide trust agent whitelisting until new API is ready. 
Fixes bug 17008504

Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
 2014-08-27 14:27:49 -07:00
Sascha Prueter
b655e756a0 Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 2014-08-27 21:18:34 +00:00
Michael Wright
3cb3e8b92f Merge "Allow voice assist to function in a non-interactive state" into lmp-dev 2014-08-27 21:16:34 +00:00
Craig Mautner
53dc7eac05 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
 2014-08-27 14:01:25 -07:00
Christopher Tate
674d3e7501 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
 2014-08-27 13:54:51 -07:00
Tim Kilbourn
fe69d6e28c Update leanback shadow parameters. 
Bug: 15859361
Change-Id: I54d184cdf72de98aa0d258774f772f874c6d0490
 2014-08-27 13:54:00 -07:00
Jim Miller
f88c2569e9 Merge "Change name of confirm credentials method after API review" into lmp-dev 2014-08-27 20:42:19 +00:00
Winson Chung
3e97f9d48b Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 2014-08-27 20:09:57 +00:00
Alan Viverette
719da6ba9b Merge "Fix NPE in RippleDrawable" into lmp-dev 2014-08-27 20:04:28 +00:00
Alan Viverette
12c75ab730 Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 2014-08-27 19:44:37 +00:00
Eric Laurent
27c30e4426 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
 2014-08-27 12:36:33 -07:00
Alan Viverette
d890c13981 Rename Spinner.Form to Spinner.Underlined, make Alert theme public 
BUG: 17286794
BUG: 17295515
Change-Id: I010bb1591f7690dbc40020d3fdd413f8e1bd8547
 2014-08-27 12:28:18 -07:00
John Spurlock
2cd88d7512 Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 2014-08-27 19:15:03 +00:00
Winson Chung
ebfc698182 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
 2014-08-27 19:07:36 +00:00
John Spurlock
c3dfd32843 Doze: Null check in NotificationContentView.mContractedChild. 
Bug: 17247547
Change-Id: Iede5d0cd88db4e293e583f3a3c324354eb6d594e
 2014-08-27 14:55:54 -04:00
Eino-Ville Talvala
2227cac5af Merge "Camera2: Correct error handling" into lmp-dev 2014-08-27 18:47:30 +00:00
Jean-Michel Trivi
c0dce273a8 Merge "SoundPool.Builder: document default values" into lmp-dev 2014-08-27 18:23:00 +00:00
Eino-Ville Talvala
acc0095bc8 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
 2014-08-27 11:08:18 -07:00
Jeff Sharkey
a9bdc43ec2 Merge "Recreate lib symlink after deleting app data." into lmp-dev 2014-08-27 17:58:38 +00:00
Jeff Sharkey
d1caf731e4 Merge "Clear pending operation flag when move failed." into lmp-dev 2014-08-27 17:58:17 +00:00
Jeff Sharkey
c521221740 Recreate lib symlink after deleting app data. 
Bug: 16739202
Change-Id: Ie8dccf67feaf6dfa474d52a3cda0862b952e6762
 2014-08-27 10:47:19 -07:00
Alan Viverette
d7853e5763 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
 2014-08-27 17:45:28 +00:00
Amith Yamasani
032402cff1 Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 2014-08-27 17:39:29 +00:00
Amith Yamasani
e084039dd2 Fix incorrect reading of multichoice app restrictions 
Clear the list of choices values before putting new ones in.

Bug: 17299310
Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
 2014-08-27 10:33:17 -07:00
Craig Mautner
d4b325a82b Merge "Revert "Debug for 13924095."" into lmp-dev 2014-08-27 17:29:58 +00:00
Jeff Sharkey
1c9edafef8 Clear pending operation flag when move failed. 
Bug: 17298448
Change-Id: I7a4af0f31d3909a9bfb5a2dd7d168015786024e3
 2014-08-27 10:24:59 -07:00
Craig Mautner
d266368435 Merge "When adding an apptoken skip over removed ones." into lmp-dev 2014-08-27 17:14:18 +00:00
Craig Mautner
4e1b6a4e59 Revert "Debug for 13924095." 
This reverts commit 76309cd761a0f9d9e44435ba9a4bde8363ba9f7b.

Logspam no longer useful, just annoying now.

Change-Id: I826d383101077cc1bb341d4a3186ef98ed7e0c00
 2014-08-27 10:07:55 -07:00
Christopher Tate
eee0ea201f Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 2014-08-27 17:06:13 +00:00
Craig Mautner
01f79cf916 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
 2014-08-27 09:56:02 -07:00
Julia Reynolds
19d431f330 Merge "Limit the settings profile/device owners can update." into lmp-dev 2014-08-27 16:49:46 +00:00
Makoto Onuki
0e917336a2 Address API review comments: 
- Rename isCorpContactId() to isEnterpriseContactId().
- Update EXTRA_* constant values.
- Update javadoc on NAME_VERIFIED.

Bug 17253963

Change-Id: I1bef3adbb4125b39129c77cca29c4b8089e1f8cc
 2014-08-27 16:29:40 +00:00
Joe Fernandez
67a8aae3c8 am 402282f3: am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '402282f3b5c544a40cc9e19a4c37bfe5277da0ce':
  docs: add warning to redirects file
 2014-08-27 16:28:07 +00:00
Raph Levien
772d576b97 Merge "New weight-aware font config" into lmp-dev 2014-08-27 16:24:37 +00:00
Raph Levien
2a5fab9d47 Merge "Fix incorrect return value on missing glyph" into lmp-dev 2014-08-27 16:24:14 +00:00
Ricardo Cervera
fc2497fe00 am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '665fc3185d2bda1780ddc9074f46e11777e05405':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:17:03 +00:00
Ricardo Cervera
1794dd8b7d am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '76428e01565997f21b6a50bd82088b11f7a1ac15':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:16:55 +00:00
Joe Fernandez
402282f3b5 am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit 'cafad30176ad621f3d943cab942af2187bdec7dc':
  docs: add warning to redirects file
 2014-08-27 16:16:13 +00:00
Ricardo Cervera
665fc3185d am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit 'df139acff19cdbca43d9cc312653f03463e645ed':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:05:10 +00:00