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

1892 Commits

Author SHA1 Message Date
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
Bart Sears
ed5ff51b2c Revert "Remove not needed contacts related perissions." 
Broke the build, reverting.

This reverts commit a2991da0d671adf511ccb884cf25bf1241303f92.

Change-Id: I2bdfa70fbd8a6c03e48426f85eeb63896762d5da
 2015-06-23 06:16:25 +00:00
Eino-Ville Talvala
b14a1ac057 Merge changes from topic 'remove-high-res' into mnc-dev 
* changes:
  Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
  Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
 2015-06-23 06:07:04 +00:00
Svet Ganov
46e2842303 am 8bf62c7d: am 477bb484: am 2b5bec93: Merge "Remove not needed contacts related perissions." into mnc-dev 
* commit '8bf62c7d0ccda08ae5982d3bbf39b72ba327b2fc':
  Remove not needed contacts related perissions.
 2015-06-23 05:39:15 +00:00
Vinit Deshpande
cb94c73c8b am 6dab8fbf: am 035d1838: am 725f145e: Merge "Address API review comments" into mnc-dev 
* commit '6dab8fbf5dcaad67646738b01dc7b66c792431b0':
  Address API review comments
 2015-06-23 05:38:34 +00:00
Svet Ganov
2b5bec9356 Merge "Remove not needed contacts related perissions." into mnc-dev 2015-06-23 04:00:06 +00:00
Nicolas Prevot
9a0f9682a9 am 69042609: am 2e70cf73: am 3ab6f9e6: Merge "Allow cross-profile app linking from work to personal." into mnc-dev 
* commit '6904260904176c67f200654d48fd8046c63011f4':
  Allow cross-profile app linking from work to personal.
 2015-06-23 03:04:52 +00:00
Vinit Deshpande
a0d929e505 Address API review comments 
Added a flags field in ScanResult; along with flag
values and methods to read them.

Changed types of passpoint related fields.

Bug: 21342042
Bug: 21572290
Bug: 21343777

Change-Id: I413960de88b387853d11b9e10f92665e9c06a81b
 2015-06-22 19:09:38 -07:00
Dianne Hackborn
d01ed46c63 Fix issue #21799741: AbstractThreadedSyncAdapter crashes... 
...when permissions aren't granted

Eat the SecurityException, turn it into a new callback.

Change-Id: Ibeffce061aa51beba097c90f431de07ce70b3c4e
 2015-06-22 17:41:44 -07:00
Nicolas Prevot
3ab6f9e691 Merge "Allow cross-profile app linking from work to personal." into mnc-dev 2015-06-22 23:18:32 +00:00
Dianne Hackborn
16036f2684 Fix issue #20654534: API Review: android.app.assist 
Remove the old classes.

Change-Id: I949350cadc5fc304e2651d7db0ffd38e45db9b6e
 2015-06-22 15:14:17 -07:00
Nicolas Prevot
9edbda18df Allow cross-profile app linking from work to personal. 
If the profile owner sets ALLOW_PARENT_APP_LINKING:

ACTION_VIEW, scheme http/https intents sent from the work profile
can be resolved by personal apps if they specify a host.

BUG:21701782
Change-Id: I372e2405345539eac9d6b4fb08def6bf84da14a6
 2015-06-22 14:39:44 -07:00
Eino-Ville Talvala
0819c75680 Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements 
- Reword requirements for FULL level
- Remove HIGH_RESOLUTION level
- Add StreamConfigurationMap#getHighResolutionOutputSizes
- Clean up StreamConfigurationMap implementation
- Add 5-argument HashCodeHelper

Bug: 20945581
Change-Id: I75ad4b23e902192c96ed501e10c7d55fc0ad72a6
 2015-06-22 14:21:22 -07:00
Casey Ho
8e27050f0e Unhide signal strength constants used by getLevel. 
Bug: 22008966
Change-Id: I0c1dc993cbf33a7109d8a4e329b05a897df6ea1b
 2015-06-22 21:08:52 +00:00
Svet Ganov
a2991da0d6 Remove not needed contacts related perissions. 
Removing the read/write profile/social stream permissions as they
are not needed anymore. These permissions are for accessing data
nested in the conacts provider which is already guaded by the
read/write contacts runtime permissions. The removed permissions
would be in the contacts group which means they would not provide
more protection compated to read/write contacts. Also removing
the permissions voids the need for app op support for legacy apps.

Removed deprecated APIs for social streams as these were deprecated
and will go away in the next release. We want apps targeting M to
not be able to compile if still suing these APIs to help with
migration.

Change-Id: I26ed9055847af7f92c78eb0f4ac8f9f1aa616fcd
 2015-06-22 13:20:55 -07:00
Julia Reynolds
762bee92f6 am 8ce3cd35: am 6286a6a8: am d66559f2: Merge "Hide device initializer methods/fields." into mnc-dev 
* commit '8ce3cd3562f4d3f8d4484228a7d53de2d51687bf':
  Hide device initializer methods/fields.
 2015-06-22 18:13:46 +00:00
Julia Reynolds
d66559f26d Merge "Hide device initializer methods/fields." into mnc-dev 2015-06-22 16:41:42 +00:00
Jae Seo
97ee3dcb75 am d54bf928: am d71fcb60: am a5103b9b: Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into mnc-dev 
* commit 'd54bf928bd4bd36027163f16bea322e9bd9edf7a':
  TIF: Add the columns for the app-linking to TvContract.Channels
 2015-06-21 22:03:56 +00:00
Jae Seo
a5103b9b52 Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into mnc-dev 2015-06-21 21:27:41 +00:00