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

37692 Commits

Author SHA1 Message Date
Alex Klyubin
092876b3fa am f96bfe86: am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit 'f96bfe86a68bfd0491a76cf6dfa515dc58f027bb':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-24 10:38:51 -07:00
Alex Klyubin
f96bfe86a6 am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit '7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-24 17:34:11 +00:00
George Mount
8fc8b5707c am 07e1b900: Merge "Fix problem on Animator with a start delay." 
* commit '07e1b9002a51032a7dc782178d3c29d3417ab266':
  Fix problem on Animator with a start delay.
 2014-03-24 09:51:52 -07:00
George Mount
07e1b9002a Merge "Fix problem on Animator with a start delay." 2014-03-24 16:46:59 +00:00
Przemyslaw Szczepaniak
ea8aa10d63 am 7638b1f3: Merge "Do not reset language in case of the TTS service reconnect." 
* commit '7638b1f3b56d8176e401a4067b18749682635f0c':
  Do not reset language in case of the TTS service reconnect.
 2014-03-24 05:28:44 -07:00
Mathew Inwood
2fd1031460 am a73b0c54: Merge "Fix log spam from View.toString()." 
* commit 'a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2':
  Fix log spam from View.toString().
 2014-03-24 05:28:40 -07:00
Przemyslaw Szczepaniak
7638b1f3b5 Merge "Do not reset language in case of the TTS service reconnect." 2014-03-24 10:08:37 +00:00
Mathew Inwood
a73b0c54b3 Merge "Fix log spam from View.toString()." 2014-03-24 09:46:24 +00:00
Craig Mautner
d649f574d5 am 296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."" 
* commit '296f1a9130cc5d5339ab1d1c3cfc7324920acf8a':
  Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
 2014-03-22 18:24:22 -07:00
Craig Mautner
296f1a9130 Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."" 2014-03-23 01:20:42 +00:00
Craig Mautner
9cf34e2ee4 Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks." 
This reverts commit f7ad855718.

After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.

Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
 2014-03-23 00:10:33 +00:00
Craig Mautner
a4796e0da7 am 61ada5d3: Merge "Add Activity methods for icons and labels." 
* commit '61ada5d330e10a738ba5f085cae5b9b339895d19':
  Add Activity methods for icons and labels.
 2014-03-22 16:50:28 -07:00
Craig Mautner
61ada5d330 Merge "Add Activity methods for icons and labels." 2014-03-22 23:44:37 +00:00
Craig Mautner
2fbd754180 Add Activity methods for icons and labels. 
New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.

Fixes bug 13562992.

Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
 2014-03-22 16:39:33 -07:00
John Spurlock
b7d975eeb6 am 9ae0c8ff: Merge "Add notification category for recommendations." 
* commit '9ae0c8ffba5ab50fb02d319a00e56fe42960cb4a':
  Add notification category for recommendations.
 2014-03-21 18:40:38 -07:00
John Spurlock
9ae0c8ffba Merge "Add notification category for recommendations." 2014-03-22 01:35:46 +00:00
John Spurlock
0a69c8c4bd Add notification category for recommendations. 
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
 2014-03-21 21:33:37 -04:00
Dianne Hackborn
d134fbedad am e9c9c441: Merge "Battery stats: track actually running time" 
* commit 'e9c9c441346586e26eccc0523fcf12f5158e53f7':
  Battery stats: track actually running time
 2014-03-21 17:30:55 -07:00
Dianne Hackborn
a1bd79268b Battery stats: track actually running time 
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.

Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.

Finally use new radio down timestamp to adjust the times we
compute for radio use.  Note that this information is not (yet)
being used to adjust how these are recorded in the history.

Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
 2014-03-21 16:14:59 -07:00
George Mount
2ed16ac623 Fix problem on Animator with a start delay. 
Bug 13589060

Change-Id: I05b9421fa141466bdbfe19f1bd5d993fa23982cb
 2014-03-21 16:13:37 -07:00
Paul Lawrence
81d63c442b am 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting" 
* commit '717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
  Don't prompt at boot if we already did that when decrypting
 2014-03-21 13:45:20 -07:00
Paul Lawrence
717e0f5db7 Merge "Don't prompt at boot if we already did that when decrypting" 2014-03-21 20:40:46 +00:00
Colin Cross
6418a7d30c am 8a60ded0: Merge "resolved conflicts for merge of a67e34c8 to master" 
* commit '8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
  Add HDMI-CEC service
 2014-03-21 13:23:05 -07:00
Colin Cross
8a60ded026 Merge "resolved conflicts for merge of a67e34c8 to master" 2014-03-21 20:19:54 +00:00
Colin Cross
a42cb8b0e2 resolved conflicts for merge of a67e34c8 to master 
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
 2014-03-21 13:11:02 -07:00
Bo Liu
4474da7c74 am caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64" 
* commit 'caf947737d3e94d2f5d839ec1fa951df7937fdb2':
  Convert a attach/detach functor in ViewRootImpl to x64
 2014-03-21 13:05:57 -07:00
Bo Liu
caf947737d Merge "Convert a attach/detach functor in ViewRootImpl to x64" 2014-03-21 20:00:35 +00:00
John Spurlock
5c076ac025 am 3daafcd7: Merge "Annotate framework vibrate calls with stream hints." 
* commit '3daafcd7bab6e3ace72396576529e3049ab4c066':
  Annotate framework vibrate calls with stream hints.
 2014-03-21 12:56:43 -07:00
John Spurlock
3daafcd7ba Merge "Annotate framework vibrate calls with stream hints." 2014-03-21 19:51:44 +00:00
Craig Mautner
5fc6747ed6 am f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks. 
* commit 'f7ad855718dc576a1618a54035b82e92356aa0d8':
  Apply FLAG_SHOW_WHEN_LOCKED within tasks.
 2014-03-21 12:32:38 -07:00
Craig Mautner
f7ad855718 Apply FLAG_SHOW_WHEN_LOCKED within tasks. 
If the bottommost fullscreen window of a task has FLAG_SHOW_WHEN_LOCKED
set then show all windows of the task that are above that window.

Fixes bug 13558398.

Change-Id: Ied8ada54efbb079eaf375470b2eae749e5551c24
 2014-03-21 12:24:07 -07:00
Bo Liu
845535a76d Convert a attach/detach functor in ViewRootImpl to x64 
Change-Id: I93c1df8abd0ecd1686e392cada099f9864926d33
 2014-03-21 12:06:23 -07:00
Alex Klyubin
92ec0a0c7a am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit 'd8c32164e19d16cf7d66b9aee368369ae16a4f0d':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-21 18:47:27 +00:00
Fabrice Di Meglio
72a3b9a136 am 7434fcec: Merge "Add support for enabled state for SearchIndexableData" 
* commit '7434fcec6928e9e570f7ab0bf033f04ca5a13ba1':
  Add support for enabled state for SearchIndexableData
 2014-03-21 11:44:21 -07:00
Fabrice Di Meglio
7434fcec69 Merge "Add support for enabled state for SearchIndexableData" 2014-03-21 18:38:58 +00:00
Fabrice Di Meglio
16f81e7542 Add support for enabled state for SearchIndexableData 
- add "enabled" member which tells if the data will be
included into the search results.

Change-Id: I17f8c4b289b21061f7fc47f4902343fecb5ddc2c
 2014-03-21 11:37:57 -07:00
Mathew Inwood
d15990aa50 Fix log spam from View.toString(). 
If a view has a non-zero ID that is not defined in resources (i.e. has been
set pragmatically), the calls to Resources.getResourcePackageName() and
Resources.getResourceEntryName() result in a log warning:
No package identifier when getting name for resource number 0x00000001

Fix this by not attempting to resolve the package & name when there is
none.

Change-Id: Id88a61539fffb36187da7911f8e8a42d5a1bb951
 2014-03-21 18:37:53 +00:00
Alex Klyubin
a2507e8764 Adjust to the change in the private SSLParameterImpl API. 
Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to
getDefaultX509TrustManager.

Bug: 13563574
Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
 2014-03-21 11:13:50 -07:00
John Spurlock
03e5344f06 am 824ad0e6: Merge "Unhide notification category." 
* commit '824ad0e6f9c799f5b0faa2024e35fc6e714a681a':
  Unhide notification category.
 2014-03-21 07:31:28 -07:00
John Spurlock
824ad0e6f9 Merge "Unhide notification category." 2014-03-21 14:26:55 +00:00
John Spurlock
fd7f1e0039 Unhide notification category. 
Rename @hidden Notification.kind -> category, and flesh out
shared values.  Now a single value.

Update framework references, remove unused SystemUpdateService
magic value unused since 2012.

Change-Id: If06d19ff3a8c3125fca1457f5d3c665e2939c66c
 2014-03-21 09:25:00 -04:00
John Spurlock
f9e1a0b369 Annotate framework vibrate calls with stream hints. 
Migrate existing framework usages of Vibrator.vibrate to use
the new overload with an explicit stream hint.  This prevents
them from being blocked by rules targeting the unspecified stream.

For calls that pass the existing appops check in VibrateService,
pass streamHint down to the input device vibrator so we don't lose
the signal, but leave it up to InputManager to decide what to do
with it - currently unused.

Change-Id: I65c944e4010edea29a412bf57d8d7d3b8098b746
 2014-03-21 08:57:53 -04:00
Przemyslaw Szczepaniak
952c0fd7bc Do not reset language in case of the TTS service reconnect. 
Bug:12428804
Change-Id: I0b1b1274c47edd28eae1701808d50aeb6c36324c
 2014-03-21 11:21:07 +00:00
Jinsuk Kim
f2fecf48f7 am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev 
* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
  Add HDMI-CEC service
 2014-03-21 02:37:00 +00:00
Jinsuk Kim
c61f4dd744 Merge "Add HDMI-CEC service" into klp-modular-dev 2014-03-21 02:32:38 +00:00
Winson Chung
5a7e7fdf94 am 7bcdb33d: Merge "Adding support for clipping window transition for alternate recents." 
* commit '7bcdb33d859ffb70f235cc8e0f22a0598194ddf8':
  Adding support for clipping window transition for alternate recents.
 2014-03-20 18:06:37 -07:00
Winson Chung
7bcdb33d85 Merge "Adding support for clipping window transition for alternate recents." 2014-03-21 01:02:44 +00:00
Winson Chung
399f62052a Adding support for clipping window transition for alternate recents. 
Change-Id: Ic7df4e6c0396afc794ffc21694814c0a93f20f31
 2014-03-20 17:39:19 -07:00
Christopher Tate
3defcfc741 am 6b904c8f: Merge "App widget backup/restore infrastructure" 
* commit '6b904c8ffd8c044a9258db495b0cc7e5c5032e59':
  App widget backup/restore infrastructure
 2014-03-20 12:53:28 -07:00
Christopher Tate
6b904c8ffd Merge "App widget backup/restore infrastructure" 2014-03-20 19:51:07 +00:00