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

150468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sascha Prueter
06114b582c am 10651214: Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 
* commit '10651214051b921da4c0b01d1825c84906cd8c53':
  Add null check to cleanupRecentTasksLocked.
 2014-08-27 21:26:55 +00:00
Michael Wright
901098ab06 am ca95dc97: Merge "Allow voice assist to function in a non-interactive state" into lmp-dev 
* commit 'ca95dc97a64a5b69c5bb4cce62590c335dfe5d71':
  Allow voice assist to function in a non-interactive state
 2014-08-27 21:26:50 +00: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
Jim Miller
c80aaf38ab am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '6104323343861e1d1edc586e19f2fdece3025065':
  Change name of confirm credentials method after API review
 2014-08-27 20:57:32 +00: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
94424fe8fb am 4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 
* commit '4de668bcb1a03e505e585d43b080029aa2780e5d':
  Additional changes to improve performance when loading Recents. (Bug 16987565)
 2014-08-27 20:17:22 +00:00
Alan Viverette
39698e77a4 am 738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev 
* commit '738aeaf442e0d7928dc795b726a5fac034471d94':
  Fix NPE in RippleDrawable
 2014-08-27 20:11:46 +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
52315cf17f am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '11e73661d71e8616b502f800eca9a7985115e898':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 19:57:54 +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
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
2b0dcd43db am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 
* commit '98a354d4619cc90bd0ef3417fbe2bc9165d4496d':
  Doze: Null check in NotificationContentView.mContractedChild.
 2014-08-27 19:25:30 +00: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
Eino-Ville Talvala
e7f72cca40 am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '579442e87e9737f424663d01e163cbc23b1346d1':
  Camera2: Correct error handling
 2014-08-27 18:58:42 +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
acf19975d2 am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit '24562d7e5c73c6be3225eff1f53ca4ffa94f09e0':
  SoundPool.Builder: document default values
 2014-08-27 18:29:36 +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
73306fda9d am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '37589a33e8abb534b931b0246143c85f5b4fbb75':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:05:33 +00:00
Jeff Sharkey
da84da1e2e am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit '31d0207abfbfe15a63028010e0d5230268b94a52':
  Clear pending operation flag when move failed.
 2014-08-27 18:05:28 +00: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
Amith Yamasani
0d140b5f4a am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit 'e656975cb7be7e883badf3257a2d66b6e664f5e0':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 17:52:15 +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
Craig Mautner
d28e611436 am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit 'b46e78f9e04dc7a292be2a3f50d72dc453a2891b':
  Revert "Debug for 13924095."
 2014-08-27 17:40:57 +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
6405a2b879 am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit 'a1ca6e00143dfe8f62c4f888ad8cac79be41d5b4':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:20:31 +00:00
Christopher Tate
00568d35f4 am 96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 
* commit '96c097737bf7874b240f86b313d561fe1f14678e':
  Remember having done full-data as well as key/value app backups
 2014-08-27 17:20:26 +00: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
Julia Reynolds
3dbf82f033 am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev 
* commit 'e21130fde2bc10068620d61c5b87ec4ddcc87760':
  Limit the settings profile/device owners can update.
 2014-08-27 16:58:26 +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
4650b32856 am d37368bf: Address API review comments: 
* commit 'd37368bf06dcaf8956cf69198636562b3043d182':
  Address API review comments:
 2014-08-27 16:42:10 +00:00
Joe Fernandez
4327228c20 am 37bd72c6: am 402282f3: am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '37bd72c6b74131305ea90af2308afd1aed7b2b98':
  docs: add warning to redirects file
 2014-08-27 16:42:06 +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
Raph Levien
1ebf8d619f am b73047ff: Merge "New weight-aware font config" into lmp-dev 
* commit 'b73047ffc83d9858677e2174c04697502c9d854c':
  New weight-aware font config
 2014-08-27 16:28:09 +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
f1800dcfee am 145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev 
* commit '145f5780fabc99b36532d4f57a5c99c7eb727d2c':
  Fix incorrect return value on missing glyph
 2014-08-27 16:28:05 +00:00
Ricardo Cervera
003f88ae7b am b37b252a: am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit 'b37b252ab8069f7e5442fdcc499334de73ceb0cc':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:28:01 +00:00
Ricardo Cervera
6a19e7464b am d3288173: am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit 'd32881732588677f0c6985d11e7e1ef120b9c6c7':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:27:52 +00:00