Nicolas Prevot
6fd49936ae
Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
2015-06-29 17:08:34 +00:00
Kenny Guy
14f48e5a93
Deprecate APIs for admin to create users.
...
Bug: 21921868
Change-Id: I0a59c85f6a87928de3df72278d4b65355ff7270f
2015-06-29 15:11:25 +00:00
Kenny Guy
43904fd5b7
Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev
2015-06-29 13:28:54 +00:00
Kenny Guy
2703a13f11
Revert "Deprecate APIs for admin to create users."
...
This reverts commit ea864c4d4d7ca390d3b67868fd2a640411bff020.
Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
2015-06-29 13:24:24 +00:00
Craig Lafayette
bee7245c69
Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev
2015-06-29 12:48:21 +00:00
Kenny Guy
01056b3662
Merge "Deprecate APIs for admin to create users." into mnc-dev
2015-06-29 12:42:21 +00:00
Dianne Hackborn
21002cf256
am c063f1cf: am 97abd672: am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev
...
* commit 'c063f1cf50c4f4b015c763af8476a25a0df7f45b':
Looks like MNC is gonna be API 23.
2015-06-27 01:07:16 +00:00
Dianne Hackborn
d5f387bc5f
Merge "Looks like MNC is gonna be API 23." into mnc-dev
2015-06-27 00:29:26 +00:00
Dianne Hackborn
2e5cad7868
Looks like MNC is gonna be API 23.
...
Change-Id: I9c9c62209c949b1a16ed53eafc259e88e2ddb69a
2015-06-26 16:15:55 -07:00
Nathan Harold
7818839d7e
am f24e9c8d: am 140f0398: am aaf280b6: Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev
...
* commit 'f24e9c8dc1bf024043f6bde6029e5a772eb58f60':
Deprecate TelephonyManager.getNeighboringCellInfo()
2015-06-26 22:26:53 +00:00
Nathan Harold
748e9d5979
Deprecate TelephonyManager.getNeighboringCellInfo()
...
bug: 22121990
Change-Id: Id8f9d080fdd1e2993b414a5304424238396b6fd4
2015-06-26 12:20:58 -07:00
Craig Lafayette
3cc72bab48
Hide MIME_TYPE_PROVISIONING_NFC_V2
...
Bug: 21918725
Change-Id: I33d67ff8f7b47ab53cff8a2664d342caf9d6e03f
2015-06-26 14:27:06 -04:00
Dianne Hackborn
d0393181f6
am 3850b7c2: am 8785d214: am ff81025a: Merge "Fix issue #22013372 : Assist should take translationX and friends..." into mnc-dev
...
* commit '3850b7c2e4ef841b154a3f1fe88493a663b550a5':
Fix issue #22013372 : Assist should take translationX and friends...
2015-06-26 18:01:40 +00:00
Dianne Hackborn
ff81025a9d
Merge "Fix issue #22013372 : Assist should take translationX and friends..." into mnc-dev
2015-06-26 17:20:12 +00:00
Kenny Guy
ea864c4d4d
Deprecate APIs for admin to create users.
...
Bug: 21921868
Change-Id: I956d24a8394d95bf975581a3451ceabe01708a10
2015-06-26 16:46:01 +00:00
Billy Lau
cbe540f946
Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle
...
to be manually enabled in Settings.
Raised the protection level of SYSTEM_ALERT_WINDOW from dangerous to
system|signature|appop. Added a new API in Settings for developers to invoke
the main configuration setting. Also added a new metrics in MetricsLogger.
Finally, also made changes to PhoneWindowManager to check the permission to draw
overlay properly.
Change-Id: I4a073e6f038b8b8d2fa5bd6ad60abda496be9701
2015-06-26 16:59:41 +01:00
Svetoslav
e072d842ec
am e7fe26c9: am f513006c: am e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev
...
* commit 'e7fe26c94b46b6e8b4860ceaba46b95584e38914':
Add JavaDoc for permission protection level
2015-06-26 15:20:50 +00:00
Dianne Hackborn
70d8be7616
Fix issue #22013372 : Assist should take translationX and friends...
...
...into account when calculating the position information
Actually what we need here is the full transformation matrix, if it
is available. And that means actually computing the location of
views on the screen requires doing this all through transformations,
so the AssistVisualizer has been changed to do this (while still
also keeping the old mechanism for comparison to verify that things
are working correctly).
Also added new properties for elevation and alpha.
And optimized the parcelling of AssistStructure to not write things
that aren't needed; this reduces the parcelled size by about half.
Change-Id: I50b0dd2e6599c74701a5d188617a3eff64b07d03
2015-06-25 20:24:34 -07:00
Nicolas Prevot
f0029c1ddb
Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
...
Also improve the javadoc.
BUG:21701782
Change-Id: I88a75ccfa71b0d5df2f4779987cf0fff56001fd3
2015-06-25 19:54:12 -07:00
Svetoslav
71b6ca6d43
Add JavaDoc for permission protection level
...
1. Add the permission protection level in the java doc
2. Make some system permissions that are not mean to be
used by third-parties system API.
bug:21402257
Change-Id: Ic0ae8d6ca44dbbbf12848a9164acc0e908c90402
2015-06-25 18:19:19 -07:00
Chris Manton
07d840ea6c
am d85c37ab: am 6e7acdd5: am 60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev
...
* commit 'd85c37ab0f8db4e58c34eabba7961d2fc61e9002':
Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL
2015-06-25 18:14:32 +00:00
Chris Manton
63f25b6e3f
Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL
...
Bug: 20828356
Change-Id: I30a286e7af884a11c51363916dd6a4dc965d399a
2015-06-25 10:08:45 -07:00
Junda Liu
2b9f141bf3
am 34c73142: am 624704ba: am e5c7ca7d: Rename and add carrier config keys for volte and ims.
...
* commit '34c73142cc51f064c7ddae3b1b648db3742c995c':
Rename and add carrier config keys for volte and ims.
2015-06-25 00:32:36 +00:00
Junda Liu
e5c7ca7d79
Rename and add carrier config keys for volte and ims.
...
Bug: b/21878236
Change-Id: I2bc36664969fce9e773ce8a53d56b92936d96971
2015-06-24 16:07:56 -07:00
Chris Wren
bb385a7199
am 4d97dbba: am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev
...
* commit '4d97dbba00d4f792c0236852d209071224e680ba':
remove setLatestEventInfo
2015-06-24 22:52:56 +00:00
Chris Wren
749d66b82f
Merge "remove setLatestEventInfo" into mnc-dev
2015-06-24 22:17:45 +00:00
Anthony Hugh
9d826681a5
Introduce stem keycodes for Wear
...
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG: 21903503
Change-Id: I8835cfdba3a8819aae61b47d018c0794ba5f772e
2015-06-24 13:22:46 -07:00
Chris Wren
a05db3816b
remove setLatestEventInfo
...
This has been deprecated since API 11.
Bug: 18510449
Change-Id: Ibd052572aa8c332daf5f6a604afe1925e8998a2b
2015-06-24 15:18:34 -04:00
Nancy Chen
1b8312a158
am 31150995: am e8bdaa9e: am 8e0aab7d: Merge "Add public action to open voicemail settings." into mnc-dev
...
* commit '311509955aa521c673e09aa9035752eabf17eb4e':
Add public action to open voicemail settings.
2015-06-24 18:10:59 +00:00
Santos Cordon
5a84f84e99
am 99c38d1c: am 3c9f1e7f: am c8cedd53: Merge "InCallService meta-data [2/4]" into mnc-dev
...
* commit '99c38d1c81ac1a43b6650c8de4aededfc236187b':
InCallService meta-data [2/4]
2015-06-24 18:10:53 +00:00
Nancy Chen
8e0aab7dd5
Merge "Add public action to open voicemail settings." into mnc-dev
2015-06-24 17:37:45 +00:00
Santos Cordon
c8cedd5311
Merge "InCallService meta-data [2/4]" into mnc-dev
2015-06-24 17:37:13 +00:00
Michael Wright
0c83048b8c
am bc12a725: am 02791a78: am 5edd0e06: Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev
...
* commit 'bc12a725e706ad077c1785c8328af0a569448d0c':
Add new SOURCE_BLUETOOTH_STYLUS.
2015-06-24 16:48:01 +00:00
Michael Wright
5edd0e06d5
Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev
2015-06-24 16:12:22 +00:00
Dan Sandler
3a6904639c
am d61f1ed3: am 6ded6ef4: am 346872d5: Merge "Allow an icon to carry a tint with it, wherever it goes." into mnc-dev
...
* commit 'd61f1ed302fad8c688716e9992d6724a3fd204ca':
Allow an icon to carry a tint with it, wherever it goes.
2015-06-24 02:45:05 +00:00
Svetoslav
9c58c651ce
am 4074a871: am 338ac4ac: am c5e43c50: Only current IME and spell checker can access user dictionary
...
* commit '4074a871cbc109d4fd518413fc4e43ba3eea41a5':
Only current IME and spell checker can access user dictionary
2015-06-24 02:33:39 +00:00
Dan Sandler
346872d538
Merge "Allow an icon to carry a tint with it, wherever it goes." into mnc-dev
2015-06-24 02:10:25 +00:00
Svetoslav
c5e43c508f
Only current IME and spell checker can access user dictionary
...
Change-Id: I6c5716d4d6ea9d5f55a71b6268d34f4faa3ac043
2015-06-24 00:56:44 +00:00
Dianne Hackborn
f81d956aa6
am 16649d96: am 1e7b818d: am fcaed606: Merge "Fix issue #20654534 : API Review: android.app.assist" into mnc-dev
...
* commit '16649d96cbc65b6e8198f1ab12ef09d7d7ed52e5':
Fix issue #20654534 : API Review: android.app.assist
2015-06-24 00:12:50 +00:00
Svetoslav Ganov
b96d1f1e69
am 242c1f33: am 4475dbca: am 2c99ea35: Merge "Remove not needed contacts related permissions." into mnc-dev
...
* commit '242c1f333431b32445336faed18feb1a90ebd6e4':
Remove not needed contacts related permissions.
2015-06-23 23:42:34 +00:00
Dianne Hackborn
fcaed60650
Merge "Fix issue #20654534 : API Review: android.app.assist" into mnc-dev
2015-06-23 23:34:22 +00:00
Zach Johnson
8fea419415
am 627c5e0a: am 9a8f0138: am 12402daf: Merge "Update CarrierService long lived binding API" into mnc-dev
...
* commit '627c5e0a9234a0e94170590cfd6ee558fec4c394':
Update CarrierService long lived binding API
2015-06-23 23:18:07 +00:00
Alan Viverette
99f5617ee5
am eea6c465: am c7201180: am 9137fcaa: Merge "Remove isDither(), deprecate setDither()" into mnc-dev
...
* commit 'eea6c46550cb3f56b75eefebbda4c7f09bbf0cdd':
Remove isDither(), deprecate setDither()
2015-06-23 23:17:54 +00:00
Svetoslav Ganov
2c99ea3524
Merge "Remove not needed contacts related permissions." into mnc-dev
2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2
Remove not needed contacts related permissions.
...
This reverts commit ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.
Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
2015-06-23 23:03:55 +00:00
Zach Johnson
12402dafea
Merge "Update CarrierService long lived binding API" into mnc-dev
2015-06-23 22:19:25 +00:00
Santos Cordon
f2600eb5ac
InCallService meta-data [2/4]
...
Bug: 21816241
Change-Id: I9af91a1287f652247ef590878759aa277bd925e5
2015-06-23 15:13:39 -07:00
Zach Johnson
08a244cee8
Update CarrierService long lived binding API
...
Should take a metadata approach instead of a separate
intent.
b/21080696
Change-Id: Ib6e2ec0d3258e419aa14ae9e598a8147505feb84
2015-06-23 14:31:13 -07:00
Paul Jensen
da65bb8678
am d61c4289: am 6716e3db: am dafd5612: Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev
...
* commit 'd61c4289c964e78ec166d485cddbed06841ad33c':
Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
2015-06-23 21:30:47 +00:00
Alan Viverette
81e7dbddf1
Remove isDither(), deprecate setDither()
...
Bug: 22013358
Change-Id: I37b11a94edc431a88522c6c056b76b045daa61d6
2015-06-23 14:30:40 -07:00