Nicolas Prevot
4d4920ad81
Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev
2014-07-24 15:36:05 +00:00
Nicolas Prevot
90af6d7365
Fixing a NullPointerException in isProfileOwnerApp.
...
Fixing a NullPointerException in isProfileOwnerApp of DevicePolicyManager
if there is no profile owner.
BUG: 16673376
Change-Id: I912fcd38343d3c1893313e6335802d26014a2e9d
2014-07-30 15:02:57 +01:00
Christoph Studer
dda48f1221
NoListener: Optimize RankingMap
...
Cache ranks and interception bits instead of re-calculating
them every time they're accessed.
Change-Id: I2c6bbeaa01648d03ff8b3690b7f21cef4e2b9d97
2014-07-30 13:48:04 +00:00
Sander Alewijnse
6c9eee8747
Add warning in the disambig for specific launchers.
...
For launcher that do not support managed profiles.
Also, ignore the intent after click on those launchers.
Change-Id: I3d5691952a9409755b7cde68a3caba98a3772665
2014-07-30 10:27:44 +00:00
Jae Seo
783645e99f
TIF: Merge TvParentalControlManager into TvInputManager
...
This change addresses the following API council feedback.
TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
TvInputManager.
== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
loaded at boot by your internal system service. It should _not_ be stored in
a Secure/Global setting.
Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
2014-07-30 15:39:39 +09:00
Alan Viverette
9e244b93c4
Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev
2014-07-28 22:45:16 +00:00
Alan Viverette
9b38f6c2cd
Revert "Update switch assets, fix SearchView asset 9-patch areas"
...
Missing updated current.txt
This reverts commit dbf6b0d68a3d502430d061cd14f03f344b50f019.
Change-Id: I70846883f56be661fa89f9eaf20f5d103f2833c6
2014-07-30 02:39:07 +00:00
Kenny Guy
6fab2b8309
Merge "Add optional handler to LauncherApps callback" into lmp-dev
2014-07-24 15:36:04 +00:00
Christoph Studer
fd19326c6b
Notification: Forward setUser() call to publicVersion
...
Change-Id: I82715d69664fcbf57ca0599994004a8630f8587c
2014-07-30 13:16:57 +00:00
Adrian Roos
8f21158fe6
Trust: Make setEnabledFeatures asynchronous
...
Unsynchronizes the call into app code from setEnabledFeatures,
replacing it with a callback mechanism. Also makes this actually
work by fixing the check in TrustManagerService to take into account
whitelisting.
Change-Id: I0831752cd2d3158eda9c8404a5569498f11ac2ac
2014-07-30 12:34:18 +00:00
Adrian Roos
7861c663fd
Add setManagingTrust and expose it on lockscreen
...
Adds a facility for trust agents to indicate if they
are ready to manage trust. Also adds an indication to
the lock icon on the lockscreen to show whether trust is
being managed.
Bug: 15518469
Bug: 16123013
Change-Id: Ie17f588aebeafe66c81dea4a69c733b0d2c72fd4
2014-07-30 12:33:33 +00:00
Kenny Guy
b42c89bfb0
Add optional handler to LauncherApps callback
...
Allow caller to pass in handler to LauncherApps
when adding a callback.
Stop apps adding callbacks twice.
Bug: 16401733
Change-Id: I2e192091c1b79acb905d899e96d6dacd45e561da
2014-07-30 11:21:01 +00:00
Torne (Richard Coles)
ff701a6a65
Parse system properties that are lists correctly.
...
String.split() returns a one-element array of the empty string if the
input is the empty string, not a zero-element array. Introduce a
getStringList function to handle this consistently in the cases where
system properties are parsed as comma separated lists.
The main result is that SUPPORTED_64_BIT_ABIS will now correctly be
empty on a 32-bit only device.
Change-Id: I6f74b48d0a6ced3cd6d49c05aad6a4b7e0b074d2
2014-07-30 12:14:40 +01:00
Jorim Jaggi
e411fdfa4c
Remove WindowManager.LayoutParams.TYPE_KEYGUARD (1/2)
...
Change-Id: I5d234dc4383bbf205bde1a0e7f1e8266fc37d13a
2014-07-29 14:43:03 +02:00
Adam Lesinski
d4bd75be4f
Merge "Add <feature-group> tag and change aapt badging" into lmp-dev
2014-07-24 15:36:09 +00:00
Prerepa Viswanadham
5bec5af971
cleanup : delete BLE advertising related hidden state references in Bluetooth Adapter
...
Change-Id: Ia58a46392157e274f8fc4696e8e25af480eb2d2a
2014-07-24 19:28:12 +00:00
Svetoslav
f7c42c5067
Updated accessibility nodes not properly cached.
...
We have an accessibiliy node info cache in the process of each
accessibility service. Sometimes the cached node changes and
in this case we have evict from the cache the sub-trees rooted
at children that are no longer present. There was bug where if
none of the children is present anymore we did not evict their
sub-trees.
Also the verification logic was not stopping if a duplicate
node is seen potentially getting into an infinite loop.
bug:15729762
Change-Id: I7adf4f0a1bde07b385556d9acdded5059231f1f3
2014-07-24 19:24:42 +00:00
Wei Wang
82a1cfa4fe
Merge "Move AdvertiseData length check to BluetoothAdvertiser." into lmp-dev
2014-07-24 15:36:09 +00:00
Hector Dearman
d49d6bf0cd
Merge "Update CookieManager API for Council review." into lmp-dev
2014-07-24 15:36:05 +00:00
Ruben Brunk
1b1f1b611c
camera2: Move noise model to dynamic metadata.
...
Bug: 16369384
Change-Id: I7a540705176c7be68431a977e2b7218ffa1bddd0
2014-07-24 17:43:54 +00:00
Hector Dearman
ffae672881
Update CookieManager API for Council review.
...
Remove synchronized from setAcceptThirdPartyCookies
Bug: 16403458
Change-Id: I6073da2c03fd0952bc447f7cfe0d959148af6877
2014-07-24 18:10:25 +01:00
Chris Craik
058fc64001
Connect shadow style attributes to renderer
...
bug:15859361
Moves lighting info out of StatefulBaseRenderer, since it's not useful
at record time, and only used by OGLR.
Change-Id: I7ab065d02d9304afad1dc4c48597a7a621366f8e
2014-07-24 16:41:13 +00:00
Robert Ly
eb355efc1b
am 39572996: am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs
...
* commit '39572996f25d4b4ce744d9d04080e33b687ab03b':
cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
2014-07-24 16:22:29 +00:00
Yorke Lee
feb2b8c0bf
Merge "Add Calls.TRANSCRIPTION to CallLog (2/2)" into lmp-dev
2014-07-24 15:36:09 +00:00
Jorim Jaggi
8a9068573c
Merge "Fix status icon reappearing for legacy activities" into lmp-dev
2014-07-24 15:35:58 +00:00
Alexandra Gherghina
0a63289632
am 7399e9cd: am 4509dc1b: am f9bd84de: Update string for account manager failures
...
* commit '7399e9cd62f7d5171eeb300c49775a496abc653c':
Update string for account manager failures
2014-07-28 12:14:51 +00:00
Wei Wang
104d187d10
am b6a313ef: am 06ef8e73: am 4e2bcebc: Split manu id and manu data.
...
* commit 'b6a313ef2b71f9080af10fb9f7a4f40d6d5bee0e':
Split manu id and manu data.
2014-07-28 12:14:47 +00:00
Alexandra Gherghina
f7f8fd64c8
Update string for account manager failures
...
Bug: 14642886
Change-Id: I200e38c7a93990787a3d6e01a583fe8ba193a987
2014-07-28 07:41:40 +00:00
Wei Wang
ab2ed62f15
Split manu id and manu data.
...
b/16407380
Change-Id: I39f6ce0ab4cccadec809f0a4f518f5d2c77a90b7
2014-07-27 23:12:26 -07:00
Jeff Brown
2da6665002
am 8bfbd2f6: am 7798e931: am 108f9dc2: Merge "Remove DozeHardware since it will not be used." into lmp-dev
...
* commit '8bfbd2f61ffb8cc9e167b45ae0306f05af54d10d':
Remove DozeHardware since it will not be used.
2014-07-26 22:56:17 +00:00
John Spurlock
fa8fccf6c7
am 382300fd: am 8ebe80a3: am c9dfaff7: Merge "Doze: Update tease signal to buzz-beep-blink from NoMan." into lmp-dev
...
* commit '382300fd23cda23040c97f2255edb5d6d351b019':
Doze: Update tease signal to buzz-beep-blink from NoMan.
2014-07-26 21:28:12 +00:00
Amith Yamasani
da466e1e91
am 8a8c5f4d: am 7ef87d4d: am 0a4e461e: Hidden global setting to allow adding users from lockscreen
...
* commit '8a8c5f4d305d0dad0f051af32914b07012bfc6a4':
Hidden global setting to allow adding users from lockscreen
2014-07-26 01:11:09 +00:00
Sandeep Siddhartha
0e2594b37c
am 4c96adaa: am 678883cc: am 5940eb3a: Fix various bugs with model management
...
* commit '4c96adaa1ec3c225fc7e57078787d88709456914':
Fix various bugs with model management
2014-07-26 00:30:25 +00:00
Sandeep Siddhartha
eb3cbfeb48
am bac00601: am dc69e6e8: am be52f0d1: Add read/writeBlob to Parcel
...
* commit 'bac0060104d359bcc2d745082546c58828bec972':
Add read/writeBlob to Parcel
2014-07-26 00:20:40 +00:00
ztenghui
29e2dd95fd
am 5b942f14: am 6038139c: am ed2a502c: Merge "API REVIEW: VectorDrawable" into lmp-dev
...
* commit '5b942f1430bc5bf6ee35455919b7985d8fdefdc2':
API REVIEW: VectorDrawable
2014-07-25 23:42:46 +00:00
Dake Gu
3480d903f2
am af735ebc: am e1b3883c: am 5a5ae1f2: fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
...
* commit 'af735ebc45a0042f9fc7efb948a254bed00cfdd3':
fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
2014-07-25 23:25:16 +00:00
Michael Wright
c1fe1251ab
am 4b4473aa: am 5f3eb6ca: am 5239ebe3: Add missing documentation for createVirtualDisplay
...
* commit '4b4473aa4f9db4eb93c439bcbd7dbb7af886c0ed':
Add missing documentation for createVirtualDisplay
2014-07-25 23:13:46 +00:00
Ruben Brunk
da39e96bff
am 10d7edab: am ddb65f32: am b4b65247: camera2: Update preview counter after request completed.
...
* commit '10d7edabfbc4b7fbe9183671768fbe2f49780031':
camera2: Update preview counter after request completed.
2014-07-25 23:13:42 +00:00
Sreeram Ramachandran
b2049de027
am 5c478c04: am f87f2fc6: am a6754382: Merge "Implement support for bypassable VPNs." into lmp-dev
...
* commit '5c478c04a0fa4391d07b50bd460e2b63bb3a138b':
Implement support for bypassable VPNs.
2014-07-25 23:13:22 +00:00
Fabrice Di Meglio
37acb3a8ab
am c07199cc: am d009491e: am 09370607: Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
...
* commit 'c07199cc93ac525a39787b8228961ad43a165126':
Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
2014-07-25 23:13:18 +00:00
Dake Gu
cf1899fd5c
am dde32310: am 575e0a7f: am 3c54a06e: ExitTransitionCoordinator: suppressLayout during running transition
...
* commit 'dde323105a6ff02b7d771ed74dfb62ecea3cf7c2':
ExitTransitionCoordinator: suppressLayout during running transition
2014-07-25 22:32:47 +00:00
John Spurlock
486c89842f
am 58981510: am cbdadc7d: am d5410ff7: Merge "Volume: Persist unsafe volume playback time." into lmp-dev
...
* commit '58981510296ed03f9deee0829461bfe76647996b':
Volume: Persist unsafe volume playback time.
2014-07-25 22:27:40 +00:00
Yorke Lee
acaf686488
am ff650115: am e120d1e5: am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev
...
* commit 'ff65011576f13cd28cafe6a83098b18bf66344db':
Update the value of PinnedPositions.UNPINNED to 0
2014-07-25 21:57:43 +00:00
Jeff Sharkey
e12a125972
am cf85d14e: am bf9964cb: am e52581f6: Offer force-dex-opt when running as root.
...
* commit 'cf85d14e12824bb51631b2a8d8cd79ff0d0e26fb':
Offer force-dex-opt when running as root.
2014-07-25 21:26:42 +00:00
Chris Craik
9537c26c3b
am 96b6d247: am b5c4634e: am 63582f46: Move ClipBounds to native
...
* commit '96b6d247b717804e5a994e0d43ee903875e18c73':
Move ClipBounds to native
2014-07-25 21:18:54 +00:00
Jeff Brown
13c726795f
Merge "Remove DozeHardware since it will not be used." into lmp-dev
2014-07-25 21:16:23 +00:00
Jeff Brown
0f208eb707
Remove DozeHardware since it will not be used.
...
Bug: 16516536
Change-Id: I14597d3c9470c94e3bc5b8cff500d2fe6b2fd977
2014-07-26 15:41:21 -07:00
John Spurlock
f7ce0125a3
am 4a65634b: am 08e7eb03: am ec2b8cb3: Merge "Volume: Show safe media warning in settings." into lmp-dev
...
* commit '4a65634b3638e1b324ee8899785ab0e86a36778c':
Volume: Show safe media warning in settings.
2014-07-25 21:13:29 +00:00
Alan Viverette
0ef12ae0a5
am aa7deddf: am 86706558: am e1af5ff0: Merge "Remove duplicate Toolbar method for setting content description" into lmp-dev
...
* commit 'aa7deddf21ca2bf3b0f5175dc302f8c50dab31f9':
Remove duplicate Toolbar method for setting content description
2014-07-25 20:21:19 +00:00
Dake Gu
c9bd94c23d
am 36cedde3: am 986078ff: am 29a67def: Merge "TransitionSet: fix excludeTarget not working" into lmp-dev
...
* commit '36cedde35de11c9bd2085adcac26bd1943ad1cd6':
TransitionSet: fix excludeTarget not working
2014-07-25 19:42:45 +00:00