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

8568 Commits

Author SHA1 Message Date
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
Dianne Hackborn
2d021f8abf am 3eb5480b: am 4401943e: am a6fb1e70: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '3eb5480b3464e7a29c0940a07cb094d24bc923f7':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 21:30:40 +00:00
Nancy Chen
a51765ed6d Add public action to open voicemail settings. 
Need public api constant to create an intent to open voicemail settings.
This is used for visual voicemail.

Bug: 21086059
Change-Id: I1a11712ead2941d5322cde6be6c3f41652bc36d8
 2015-06-23 14:17:48 -07:00
Dianne Hackborn
8ecf16d186 Fix issue #20654534: API Review: android.app.assist 
Remove the old ViewAssistStructure class.

Change-Id: I5eca7bc7af93cda5f654c9094a3aa07fe4958da2
 2015-06-23 13:09:21 -07:00
Paul Jensen
dafd561298 Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev 2015-06-23 19:40:02 +00:00
Dianne Hackborn
a6fb1e70ff Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 19:33:04 +00:00
Dianne Hackborn
ee9a55fd4b am 80e364a7: am 11ef84c8: am 6af40c83: Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 
* commit '80e364a71ac41672436f86b2ceb61698f4fb59d1':
  Fix issue #21799741: AbstractThreadedSyncAdapter crashes...
 2015-06-23 18:23:06 +00:00
Lorenzo Colitti
4c060a190f am ba7ee88c: am acf761eb: am e2d921da: Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev 
* commit 'ba7ee88cb78aee12e923a531f513d6d90965db7a':
  Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.
 2015-06-23 18:22:49 +00:00
Paul Jensen
3d194eae6f Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL 
Bug: 21343774
Bug: 20898908
Change-Id: I23069a6cba346999d1b2eeaa445023bd6bf4ef94
 2015-06-23 14:09:01 -04:00
Tao Bai
8965377b69 Add WebView permission MIDI sysex 
Change-Id: I0d27e8ca48ee35b02dddc5d85ecfebfdaa3ec8cb
 2015-06-23 11:05:59 -07:00
Dianne Hackborn
6af40c8338 Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 2015-06-23 16:45:50 +00:00
Lorenzo Colitti
e2d921da29 Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-dev 2015-06-23 14:41:57 +00:00
Michael Wright
f18920ba31 Add new SOURCE_BLUETOOTH_STYLUS. 
Bug: 21531826
Change-Id: Ib3448230d542a2aadb0f697db33451f69e089612
 2015-06-23 14:50:36 +01:00
Zoltan Szatmary-Ban
4b8de703b5 am d4fafa83: am ddc6d37e: am 2c3c66a2: Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 
* commit 'd4fafa831c23ec2f1fcea8450a843a087ddcf0d6':
  Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN
 2015-06-23 10:11:54 +00:00
Zoltan Szatmary-Ban
2c3c66a2cf Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 2015-06-23 08:44:49 +00:00
Bart Sears
edfda6a1c8 am 0623d635: am 2544da4c: am 1ef23ade: Merge "Revert "Remove not needed contacts related perissions."" into mnc-dev 
* commit '0623d6359178df8861159f188df7645959866cd8':
  Revert "Remove not needed contacts related perissions."
 2015-06-23 06:55:00 +00:00
Eino-Ville Talvala
c3854a0948 am b3e27987: am 963b7100: am b14a1ac0: Merge changes from topic \'remove-high-res\' into mnc-dev 
* commit 'b3e2798707d590f0b76a5ea14a0565bf8bee6d77':
  Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
  Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
 2015-06-23 06:41:54 +00:00
Dan Sandler
24f11b1871 Allow an icon to carry a tint with it, wherever it goes. 
Bug: 21031774
Change-Id: I2d06c7288e0c0a06bf6ff147dfbfdea5a46fd288
 2015-06-23 02:21:55 -04:00
Bart Sears
1ef23adef8 Merge "Revert "Remove not needed contacts related perissions."" into mnc-dev 2015-06-23 06:18:20 +00:00