Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,128 Commits 3 Branches 0 Tags
538dbaee16a802e355a07722bf445a48a2abe882
Commit Graph

152128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
538dbaee16 am 4db2f706: am 2dac2b7d: Merge "Call onPhoneDestroyed when the service is unbound." into lmp-dev 
* commit '4db2f7063fff109d4142595d9fe08bf4dc445239':
  Call onPhoneDestroyed when the service is unbound.
 2014-08-28 03:38:33 +00:00
Yorke Lee
1238a8e7d3 am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit '9aedb262a98532e30658c00e5acff33c1b7c32a9':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 03:38:18 +00:00
Dongwon Kang
b266bdcca0 am 4146f007: am 62df6072: Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 
* commit '4146f007d65d52f75ce7781562747d2c15a892f1':
  TIF: fix callback cleanup logic in removeSessionStateLocked().
 2014-08-28 03:38:06 +00:00
Michael Wright
17f7fa5cfe am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f7898245a265106672ff29f35289c703ed50c7ce':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 03:38:00 +00:00
Christopher Tate
2f123e65c1 am ed7e8009: am 977b314b: Merge "Do not require device provisioning to do restore-at-install" into lmp-dev 
* commit 'ed7e80096b3b392a94a5d7f5ef321c0f5997911f':
  Do not require device provisioning to do restore-at-install
 2014-08-28 03:37:55 +00:00
Filip Gruszczynski
bbc0f67195 am 2a81e91f: am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '2a81e91f63c14ddf04c82a124096553c36924344':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-28 03:37:54 +00:00
Santos Cordon
7b42eed092 am 2dac2b7d: Merge "Call onPhoneDestroyed when the service is unbound." into lmp-dev 
* commit '2dac2b7dc74794f8d1bccb2a34584ce9c25eed72':
  Call onPhoneDestroyed when the service is unbound.
 2014-08-28 01:56:41 +00:00
Santos Cordon
0e85f35514 Merge "Call onPhoneDestroyed when the service is unbound." into lmp-dev 2014-08-28 00:57:46 +00:00
Santos Cordon
f30d7e9a8e Call onPhoneDestroyed when the service is unbound. 
Bug: 17253031
Change-Id: I1a74e0f2fe1ec9172268638dba531c17d22dee99
 2014-08-27 17:29:29 -07:00
Yorke Lee
d81c4b4195 am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit 'e4ba7f2bfe6f77bc677780f7256209de1893ed6e':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 00:23:41 +00:00
Yorke Lee
fe7c3bc082 Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 2014-08-28 00:16:27 +00:00
Dongwon Kang
f0285d8c2b am 62df6072: Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev 
* commit '62df6072388ce1018455a79eeeb12ba3fcfbf6b2':
  TIF: fix callback cleanup logic in removeSessionStateLocked().
 2014-08-28 00:15:50 +00:00
Michael Wright
0f7016841d am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'd0f6975b8b3581bfdcdd94d293e25e1ac0706d19':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 00:15:45 +00:00
Christopher Tate
afab9ecffb am 977b314b: Merge "Do not require device provisioning to do restore-at-install" into lmp-dev 
* commit '977b314b85e197a0024b3f232ff249e9418197d2':
  Do not require device provisioning to do restore-at-install
 2014-08-28 00:15:40 +00: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
825102d77d am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '21187a7a57bf6455fb2ffa8a7cf27fb20308a0b1':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-27 23:30:52 +00:00
Yorke Lee
52e7750184 Update value of EXTRA_CALL_TYPE_FILTER 
Bug: 17253963
Change-Id: I1e98fc2a25b0bc807b0b4d1af2941da6660e09e0
 2014-08-27 16:28:12 -07: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
Alan Viverette
254d967735 am 4ff0086e: am 79bd9953: Merge "Preserve inner drawable bounds and level on mutate" into lmp-dev 
* commit '4ff0086ee29efea067145732edf3e4f0976099b3':
  Preserve inner drawable bounds and level on mutate
 2014-08-27 22:54:50 +00:00
Alan Viverette
79dbddefbb am 79bd9953: Merge "Preserve inner drawable bounds and level on mutate" into lmp-dev 
* commit '79bd9953b25bb7be002784ecddaa15bcf14b806a':
  Preserve inner drawable bounds and level on mutate
 2014-08-27 22:41:27 +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
Tim Kilbourn
bb038bec55 am 500bba0b: am 6f9d8dd7: Merge "Update leanback shadow parameters." into lmp-dev 
* commit '500bba0b160c60e64cd61aca8c68455addb8e946':
  Update leanback shadow parameters.
 2014-08-27 22:36:02 +00: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
e76d4e26c2 am 6f9d8dd7: Merge "Update leanback shadow parameters." into lmp-dev 
* commit '6f9d8dd760104a47dd9f754fd6a4f96665d3fb00':
  Update leanback shadow parameters.
 2014-08-27 22:26:23 +00:00
Eric Laurent
8fd0f8f01d am 02d9054a: am db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 
* commit '02d9054a9a9440b0f12780221cc385fe6334f556':
  fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
 2014-08-27 22:13:46 +00:00
Tim Kilbourn
12ed679911 Merge "Update leanback shadow parameters." into lmp-dev 2014-08-27 22:07:37 +00:00
Eric Laurent
1c2d8c2d45 am db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 
* commit 'db1c0e1964f514ccaab1cc1b6325f5db0fe11fd0':
  fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
 2014-08-27 21:59:21 +00:00
Jim Miller
21219ffcce am 694a6bbc: am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit '694a6bbcc6c49a76fae440fdadab16879556c7bf':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 21:52:59 +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
8730bdf76c am c5cabe2d: Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 
* commit 'c5cabe2d00450cb18f856618260e0fa7d780452b':
  Hide trust agent whitelisting until new API is ready.
 2014-08-27 21:44:15 +00:00
Sascha Prueter
e6295fdb30 am a64ecf44: am 10651214: Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev 
* commit 'a64ecf44914f8654cf983cde4298df283ccf8f15':
  Add null check to cleanupRecentTasksLocked.
 2014-08-27 21:43:47 +00:00
Michael Wright
0a4314c468 am 29969105: am ca95dc97: Merge "Allow voice assist to function in a non-interactive state" into lmp-dev 
* commit '2996910596cd6d71637f8c38f57a6ced0cc77963':
  Allow voice assist to function in a non-interactive state
 2014-08-27 21:43:42 +00:00
Jim Miller
bb22e2a7a4 am 56c0e1db: am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev 
* commit '56c0e1db523779ee7856ac196b7370b7433142b3':
  Change name of confirm credentials method after API review
 2014-08-27 21:36:53 +00:00
Winson Chung
275720fe43 am 1e1c328f: am 4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 
* commit '1e1c328f9e9605e8eed1e9729067dfd702fb4f81':
  Additional changes to improve performance when loading Recents. (Bug 16987565)
 2014-08-27 21:36:24 +00:00
Alan Viverette
6d2f4977e0 am f467b7c0: am 738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev 
* commit 'f467b7c0e434902a48d9c459c4d4de0279e8f160':
  Fix NPE in RippleDrawable
 2014-08-27 21:36:18 +00:00
Alan Viverette
66d9747da1 am 7d5bbea6: am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '7d5bbea6bf76a705cd9d6d3d0cdfad18169440bf':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 21:36:12 +00:00
John Spurlock
2f47f7fc40 am 8354e284: am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 
* commit '8354e2846d962b054c85832b62b621bd8ae1ff48':
  Doze: Null check in NotificationContentView.mContractedChild.
 2014-08-27 21:35:55 +00:00
Eino-Ville Talvala
bf8a6d77b0 am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '4046697e3a6b409e8bcd76a06b3d457814c8f444':
  Camera2: Correct error handling
 2014-08-27 21:35:42 +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
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
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