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

151048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
1df1473008 Make it possible to remove current user 
Due to the async nature of switching users, it's not possible to
switch and remove immediately. So mark the switch target user as
soon as the user switch is requested, so that a remove will proceed
without failing at stopUserLocked().

Also, fix a similar problem with deleting the current guest and
switching to a new guest. It was attempting to remove the current
user which will result in a failed stopping of the user.
Added a way to mark the current guest
for deletion so that a new one can be created, switched to and the
old one deleted. If runtime fails, old guest is already marked for
deletion and will be cleaned up on restart.

Bug: 17321533
Change-Id: I4be0fb956227e0bb95588b5b1f2867fb1e655c0d
 2014-08-29 22:06:16 -07:00
Wonsik Kim
f271eacba7 Bind hardware TIS at startup 
Bug: 17336654
Change-Id: Ia1354305ee83c7c15afb7647f000c8b023c4648d
 2014-08-30 12:55:10 +09:00
Rachad
2875858533 am ba5fd177: Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 
* commit 'ba5fd1778b2e53461f1893d15c1a0d9233b2b4d4':
  Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID
 2014-08-30 01:49:20 +00:00
Yorke Lee
282f368069 Add lookup key to callerInfo 
Bug: 16825519
Change-Id: I71c4b2366caa3351b1f2cedd1c341f9ac909b7ea
 2014-08-29 18:40:09 -07:00
Rachad
8b63a2bf50 Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 2014-08-30 01:11:36 +00:00
Christopher Tate
d67a78db88 Don't rewrite package restrictions unconditionally in findPreferredActivity() 
We've been forcing a rewrite of package restrictions when doing preferred-
activity lookups in most cases, even when the lookup was not actually making
any changes to the bookkeeping.  Now we only do so when something has
actually changed.  Flash drives everywhere rejoice.

Bug 17334180

Change-Id: Id8f20723002b7bbcc1d82ccde55df6ef727b64ba
 2014-08-29 18:04:15 -07:00
Jae Seo
e008cd0d75 am 8a8afdfa: Merge "TIF: Fix comment on TvContentRating" into lmp-dev 
* commit '8a8afdfac59933437f8c36420aa9f04c13d5cf3a':
  TIF: Fix comment on TvContentRating
 2014-08-30 01:00:40 +00:00
Jeff Sharkey
6af85d7300 am 1722913f: Merge "More API lint checks." into lmp-dev 
* commit '1722913f4bdaa8949069333032594f47fb866123':
  More API lint checks.
 2014-08-30 01:00:35 +00:00
Jae Seo
f7255fcc14 Merge "TIF: Fix comment on TvContentRating" into lmp-dev 2014-08-30 00:51:19 +00:00
Jeff Sharkey
8428c5cbe2 Merge "More API lint checks." into lmp-dev 2014-08-30 00:45:28 +00:00
Jeff Sharkey
294f0de15b More API lint checks. 
When offering a helper Service, etc, all platform provided methods
should be marked final.  Otherwise, if available for developer to
override, they should follow onFoo() style naming.

Catch anyone returning concrete collections types, and look for
overlapping flags.

Change-Id: I29d95f3dff78a4da968a46f10be89eada509648c
 2014-08-29 17:41:49 -07:00
Ruben Brunk
0f946d172a am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 
* commit 'ea33afcb1fe0747b427ece6e73fe4f64e741fead':
  camera2: Add HDR vendor tag for legacy mode.
 2014-08-30 00:33:01 +00:00
Alan Viverette
b7517be3d6 am 1ebb78f5: Merge "Fix disappearing ripple background, treat active ripple separately" into lmp-dev 
* commit '1ebb78f529db6f01433907f93d8bbf938af6df87':
  Fix disappearing ripple background, treat active ripple separately
 2014-08-30 00:32:56 +00:00
Jean-Michel Trivi
c5258433dd Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager 
For ACTION_HEADSET_PLUG (already in SDK):
 - duplicated definition in AudioManager and moved
  javadoc there. Javadoc in Intent points to AudioManager.
 - the String value is not changed

For ACTION_HDMI_AUDIO_PLUG (being added in SDK):
 - moved defintion from Intent to AudioManager
 - updated String value to reflect package name "android.media"
  instead of using "android.intent"
 - added definition of the extras, but removed "name".

For ACTION_ANALOG_AUDIO_DOCK_PLUG,
    ACTION_DIGITAL_AUDIO_DOCK_PLUG,
    ACTION_USB_AUDIO_ACCESSORY_PLUG,
    ACTION_USB_AUDIO_DEVICE_PLUG, all hidden:
 - moved definition from Intent to AudioManager,
 - changed the value from "android.intent.*" to "android.media.*"

Updated AudioService, UsbDeviceManager and UsbHostManager
 to refer to the actions in AudioManager, not Intent.

Bug 17289385

Change-Id: I61dd73140022d2bb9a676a57f595092c8fa89dcc
 2014-08-29 17:29:27 -07:00
Ruben Brunk
6293217929 Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 2014-08-30 00:27:43 +00:00
Alan Viverette
be50bd76a9 Merge "Fix disappearing ripple background, treat active ripple separately" into lmp-dev 2014-08-30 00:19:51 +00:00
Tsuwei Chen
52617bbff8 Reload GPS configuration after carrier info is available. 
Bug: 17110478
Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e
 2014-08-30 00:17:39 +00:00
Jeff Sharkey
05401fe80c am cd3fa42d: Ships passing in the night! 
* commit 'cd3fa42d2ad7df9168b3c94b93f87ed79faea9be':
  Ships passing in the night!
 2014-08-29 23:57:08 +00:00
Jeff Sharkey
af0fe973b3 Ships passing in the night! 
Fix build breakage.

Change-Id: I37e20b7e6838cb95cfd30efb52d68e81b346f8eb
 2014-08-29 16:44:09 -07:00
Alan Viverette
99758ca82e am 30da9cd4: Merge "Variety of small UI tweaks" into lmp-dev 
* commit '30da9cd4009b42cdcaff5787c7ef4f8fa6f34dee':
  Variety of small UI tweaks
 2014-08-29 23:36:01 +00:00
dcashman
ce880fc089 am 219d9d38: Merge "Address KeySet API Review" into lmp-dev 
* commit '219d9d387b1d6133e8dd61b78f5e2556a4566a87':
  Address KeySet API Review
 2014-08-29 23:35:56 +00:00
Robin Lee
b228a5b4d4 am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev 
* commit 'cf5d78fb25a6c1d623ea8d8f5eddab8d6cd3e556':
  Keep managed profile keystores in sync with owner
 2014-08-29 23:35:49 +00:00
Jeff Sharkey
d0c87232f6 am 57d0790a: Merge "Final pass at Material DocumentsUI." into lmp-dev 
* commit '57d0790a7a593e5fe17fc3397a1f980074fa608e':
  Final pass at Material DocumentsUI.
 2014-08-29 23:35:41 +00:00
Dianne Hackborn
f434d2aa6b am 372c1ee8: Merge "More debug for issue #17310019: pause when launching settings" into lmp-dev 
* commit '372c1ee8499261fe0767fa9154077ef364c96029':
  More debug for issue #17310019: pause when launching settings
 2014-08-29 23:35:28 +00:00
Andrew Lee
dda486d3c0 am 08c79caf: Merge "Add functions for setting/getting phone accounts." into lmp-dev 
* commit '08c79caf5e8e5f7d1903f2b781918312d3288a3d':
  Add functions for setting/getting phone accounts.
 2014-08-29 23:35:23 +00:00
George Mount
39b7014384 am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 
* commit '2ad5c527c0e196ca7f62d4c04b60aad18b6a7c26':
  Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
 2014-08-29 23:35:18 +00:00
RoboErik
7c5b5ada70 am 169739a7: Merge "Document MediaSession.Callback.onMediaButtonEvent and add returns" into lmp-dev 
* commit '169739a7feaa201268381988bbfc671dd786d5dd':
  Document MediaSession.Callback.onMediaButtonEvent and add returns
 2014-08-29 23:35:13 +00:00
Dianne Hackborn
25f9acc4f6 am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev 
* commit '325662a3559d3504dbc9f6f38615eb9564185c2a':
  Oh sticky broadcasts, I'd like to do even worse to you.
 2014-08-29 23:35:08 +00:00
John Spurlock
aae97ee46d am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev 
* commit '84a39cb09e300386d6875c1f555c969089814fd8':
  Add a hidden system method to check call filter.
 2014-08-29 23:34:51 +00:00
Andrew Jeon
b8d5b49775 am 75d95d4c: Merge "Replace "Comment" to "Description" since description makes more sense in the context of the java doc." into lmp-dev 
* commit '75d95d4c82847e57ff817d5f11423caa83407d67':
  Replace "Comment" to "Description" since description makes more sense in the context of the java doc.
 2014-08-29 23:34:46 +00:00
Amith Yamasani
e05b340871 am 9d375df7: Merge "Clean up apks installed for a removed user" into lmp-dev 
* commit '9d375df719ab6b6c85e3bff9a46666c3827ae102':
  Clean up apks installed for a removed user
 2014-08-29 23:34:30 +00:00
Christopher Tate
e23d819109 am fc6eda1b: Merge "Expand job scheduler dumpsys a bit" into lmp-dev 
* commit 'fc6eda1bc93083e57030f680a6eb07ce53211281':
  Expand job scheduler dumpsys a bit
 2014-08-29 23:34:22 +00:00
Michael Wright
aafd4b423d am 224c2ccc: Merge "Use a linear spline if there\'s a non-monotonic brightness curve" into lmp-dev 
* commit '224c2ccc66cf937de84a79e89997685a162cc905':
  Use a linear spline if there's a non-monotonic brightness curve
 2014-08-29 23:34:17 +00:00
Dianne Hackborn
61c6e1bceb am aa631d9a: Merge "Fix issue #17329066: Crash in ActivityManager" into lmp-dev 
* commit 'aa631d9a3f6216f94e70d0b40edda01a94de614a':
  Fix issue #17329066: Crash in ActivityManager
 2014-08-29 23:34:12 +00:00
Adam Lesinski
ee9fe59050 am fe622efc: Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev 
* commit 'fe622efc738b56127e9683f6dd32b50f87a4adbc':
  Add test to ensure themes get copied from separate resource tables
 2014-08-29 23:34:08 +00:00
ztenghui
900beeb2ef am b379a6e9: Merge "Ambient shadow tessellation improvement." into lmp-dev 
* commit 'b379a6e93752b196a6dff9e4f081f1702f96fab2':
  Ambient shadow tessellation improvement.
 2014-08-29 23:34:03 +00:00
Dianne Hackborn
020087332d am 8eec555a: Merge "Fix issue #17329290: NPE during ContentProviderRecord.dump()" into lmp-dev 
* commit '8eec555a07e0bc01952281dcc20c1158543d4878':
  Fix issue #17329290: NPE during ContentProviderRecord.dump()
 2014-08-29 23:33:57 +00:00
Scott Rowe
9e8c59a844 am 526b7932: am 4d50fde5: am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs 
* commit '526b793275f626176fedaf1b08bc05b7d08b4ae1':
  docs: remove references to resource browser; point to SDK instead
 2014-08-29 23:33:53 +00:00
Chris Wren
3cdfa64906 am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit '7d0a2a7f7d0e87fa76dbf7c29b91a9ce4331b733':
  Disable lockscreen notifications for secure users on upgrade.
 2014-08-29 23:33:48 +00:00
Winson Chung
f4e4a782d9 am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '82f0abc42920441dca10be57ba0287a1e7dd3a46':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-08-29 23:33:43 +00:00
Craig Mautner
55b2670aa5 am 6b792116: Merge "Don\'t use anim background for translucent windows" into lmp-dev 
* commit '6b792116998ff005d3293605a453fee95c4c83a1':
  Don't use anim background for translucent windows
 2014-08-29 23:33:39 +00:00
Jae Seo
b417c9d0e2 TIF: Fix comment on TvContentRating 
Bug: 17332911
Change-Id: Ia2d76b2c6ecf6b804f8b6aa8cec78a243b70e966
 2014-08-29 16:13:07 -07:00
Alan Viverette
cf2a75a66e Merge "Variety of small UI tweaks" into lmp-dev 2014-08-29 23:08:01 +00:00
dcashman
efb1f36f09 Merge "Address KeySet API Review" into lmp-dev 2014-08-29 23:06:50 +00:00
George Mount
984011f685 Use optimized Keyframes for Path animations. 
Bug 17005728

Change-Id: I2e109ed1a3e768e1e0286fc3950516f16509e591
 2014-08-29 16:02:28 -07:00
Robin Lee
bccf6f0323 Merge "Keep managed profile keystores in sync with owner" into lmp-dev 2014-08-29 23:01:29 +00:00
Jeff Sharkey
95c047d922 Merge "Final pass at Material DocumentsUI." into lmp-dev 2014-08-29 22:56:57 +00:00
Dianne Hackborn
7f91c335dc Merge "More debug for issue #17310019: pause when launching settings" into lmp-dev 2014-08-29 22:49:40 +00:00
Andrew Lee
68d207ec8c Merge "Add functions for setting/getting phone accounts." into lmp-dev 2014-08-29 22:46:21 +00:00
George Mount
9a61f9485e Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 2014-08-29 22:43:25 +00:00