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

314658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
d0f476bdae Merge changes from topic 'network_specifier' 
* changes:
  [CM] Unhide the NetworkSpecifier as object API
  Make the NetworkSpecifier a class instead of a string.
 2017-04-12 22:27:37 +00:00
Jack He
76cd53a953 Add developer setting and system API for inband ringing support 
* Add 1 system API to check inband ringing flag in config.xml
	static isInbandRingingSupported(Context)
* Add developer menu options to enable this feature

Bug: 19171297
Test: mm -j 40, HFP regression testing, testplans/82144
Change-Id: Iaf56ea41911f546bbc7ae1f82e399d0f8d48f75f
(cherry picked from commit e86bdcaed1372aa05bdfba175007b05613aecd9b)
 2017-04-12 22:24:37 +00:00
Tony Mak
a06e779bfe Merge "clear calling identity before calling settings provider" into oc-dev 
am: c240c9b134

Change-Id: I7b45453ad9dc57ac6c3a9b83f20731f9dcfbf114
 2017-04-12 22:18:56 +00:00
Amit Mahajan
1c29bdda34 Merge "Add p2 option in openLogicalChannel." into oc-dev 
am: 682ce66309

Change-Id: I877f9e817beabcf9786796fd5accf06b1dcb3f36
 2017-04-12 22:13:42 +00:00
TreeHugger Robot
c240c9b134 Merge "clear calling identity before calling settings provider" into oc-dev 2017-04-12 22:09:24 +00:00
Amit Mahajan
682ce66309 Merge "Add p2 option in openLogicalChannel." into oc-dev 2017-04-12 22:02:39 +00:00
Jakub Pawlowski
2ef7bb7b06 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b 
am: ce8de6c3f7

Change-Id: I74da41983775b03ee2e642a07b5a8bdcf3be45cf
 2017-04-12 21:56:26 +00:00
Dianne Hackborn
59c6507670 Merge "Allow appops command to modify uid ops." into oc-dev 
am: 81bfe1f62e

Change-Id: I843f40212346a3edaf219af5ec47ba16428914ad
 2017-04-12 21:51:00 +00:00
Jakub Pawlowski
ce8de6c3f7 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 
am: d43127865b

Change-Id: I782c0ad038cd68c00b7dd5908c7975e79b672a04
 2017-04-12 21:45:52 +00:00
Adam Lesinski
5ec8875d20 Update docs for obtainStyledAttribute 
Include the requirement that the input attribute ID array
must be sorted.

Bug: 34802757
Change-Id: I3244178c52df77078afae656652c3a44447fa645
Test: none
 2017-04-12 14:45:14 -07:00
Andrew Solovay
2b03511377 doc: Add note to Context.bindService() 
Per email from Dianne H, even if bindService() returns false, the
client should still call unbindService() to release the connection.

Doc is staged to:

http://go/dac-stage/reference/android/content/Context.html#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int)

Bug: 37092557
Test: make ds-docs
Change-Id: I5849aaccec933ee7660b31241e4d8eff9ee1ef72
 2017-04-12 14:43:57 -07:00
Dianne Hackborn
81bfe1f62e Merge "Allow appops command to modify uid ops." into oc-dev 2017-04-12 21:37:52 +00:00
Jakub Pawlowski
d43127865b Merge "Bluetooth 5 PHY simplification" 
am: a9acf9db97

Change-Id: Ibd712a7629d946c24640da0e07496c229c35f7ad
 2017-04-12 21:35:25 +00:00
Sudheer Shanka
3af0294c36 Update NPMS internal state when app idle parole state is changed. 
Fixes: 37250313
Test: 1. cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests
      2. runtest -c com.android.server.NetworkPolicyManagerServiceTest frameworks-services
Change-Id: I5fcac397116a07fe9015b7dabf5bca57b0b23176
 2017-04-12 14:35:16 -07:00
Android Build Merger (Role)
ed0454fa80 Merge "Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 am: f9197e0180 -s ours" into oc-dev-plus-aosp 2017-04-12 21:35:02 +00:00
Svet Ganov
b7190a75de Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 
am: f9197e0180  -s ours

Change-Id: Ib3f118b07fbb994daa70ecbf37bc35dc4d16897b
 2017-04-12 21:34:02 +00:00
Android Build Merger (Role)
be09e43773 Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b am: f72b1104f3 -s ours" into oc-dev-plus-aosp 2017-04-12 21:33:46 +00:00
Julius D'souza
c6241aee14 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b 
am: f72b1104f3  -s ours

Change-Id: I5d0b6cd4522507d6b8cffb88461a546de5b6f519
 2017-04-12 21:32:43 +00:00
Svet Ganov
e9e44c7892 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 am: 91ed4d7553 -s ours 
am: 84ec9cbace

Change-Id: I44899ea4d5c7a48d7168cb008db31f0b62b093be
 2017-04-12 21:30:45 +00:00
Julius D'souza
b19d94bf80 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b -s ours 
am: 3a967f92f2

Change-Id: I925d8a6b9bfb9e3020fd3a5a01794f4cc0243be4
 2017-04-12 21:29:50 +00:00
Svet Ganov
bbef731c2d Merge "Add autofill feature API" into oc-dev 
am: a402d6dd2f

Change-Id: I5cfa36adbf31c49dffc519963545f388cae4b96d
 2017-04-12 21:28:45 +00:00
Dianne Hackborn
ef95ec85ea Merge "Add API to get a uid's current importance." into oc-dev 
am: ad6ab44e15

Change-Id: I845cb5fd01ccedd4a95093c56a320ee1f6497dac
 2017-04-12 21:27:27 +00:00
Makoto Onuki
3c0b432ea4 Merge ""bmgr restore" really should wait until operation finishes." into oc-dev 
am: b4c2e6f468

Change-Id: Ic8779cbe121fcc2108bc742a6a9f2be866c76df3
 2017-04-12 21:26:08 +00:00
Jakub Pawlowski
a9acf9db97 Merge "Bluetooth 5 PHY simplification" 2017-04-12 21:22:29 +00:00
Svet Ganov
f9197e0180 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 
am: 91ed4d7553

Change-Id: I8c34b0ee542819bb254183a96845e925bce2b0a8
 2017-04-12 21:22:08 +00:00
Svet Ganov
84ec9cbace Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev am: 39c3d2cf16 
am: 91ed4d7553  -s ours

Change-Id: Ia744f56107b83b6a5d5e236d24641bd7db71ab02
 2017-04-12 21:21:56 +00:00
Dianne Hackborn
33e80232fc Merge "Fix issue #37220301: Allow broadcasts with permissions to not be restricted" into oc-dev 
am: f74210c3a3

Change-Id: I1ed7f3e0cf3ee644bdbe5cb87b06f8b910d9ddec
 2017-04-12 21:21:52 +00:00
Julius D'souza
f72b1104f3 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 
am: f72dd4142b

Change-Id: I9466a9f2a35ac3f81b2203347afc9f2f62587b20
 2017-04-12 21:20:50 +00:00
Julius D'souza
3a967f92f2 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 
am: f72dd4142b  -s ours

Change-Id: Ia99beb815b720219daecfdc9446c5ff2c4d1b16f
 2017-04-12 21:20:47 +00:00
Selim Gurun
24d68dc3d8 Merge "Deprecate findAddress() method" into oc-dev 
am: c68b1a8aef

Change-Id: I667ebcf6a9a18ae5a07a7e0f737abb6162568f83
 2017-04-12 21:19:16 +00:00
Roozbeh Pournader
e740fd8d7b Switch i18n listeners to use IME hint locales 
Previously, the i18n listeners were keyed off the text locales of the
TextView. This could create some unanticipated backward
compatibility headaches. The IME hint locales seems to be a better
match, since they are supposed to be used for input.

Fixes: 37249649
Fixes: 37133729
Fixes: 37222714
Bug: https://code.google.com/p/android/issues/detail?id=2626
Bug: 8319249
Bug: 33276673
Bug: 34394455
Bug: 37160895
Test: Updated and added CTS tests pass
Change-Id: If8a115f3e30ff1601dee426a504984e2ce24a776
 2017-04-12 14:19:02 -07:00
TreeHugger Robot
a402d6dd2f Merge "Add autofill feature API" into oc-dev 2017-04-12 21:17:33 +00:00
Shuo Qian
56d3af6680 Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f 
am: 36611a0958

Change-Id: Ib68a4e3b34ad4d76e4b254350b523eaa424b30f9
 2017-04-12 21:11:58 +00:00
Svet Ganov
91ed4d7553 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev 
am: 39c3d2cf16

Change-Id: I3ddf7e0ceadd7c179f3c7de198658af190985f1b
 2017-04-12 21:11:57 +00:00
Dianne Hackborn
ad6ab44e15 Merge "Add API to get a uid's current importance." into oc-dev 2017-04-12 21:11:46 +00:00
Julius D'souza
f72dd4142b DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. 
am: 0a8ecc6886

Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739
 2017-04-12 21:10:49 +00:00
Makoto Onuki
b4c2e6f468 Merge ""bmgr restore" really should wait until operation finishes." into oc-dev 2017-04-12 21:10:37 +00:00
Dianne Hackborn
f74210c3a3 Merge "Fix issue #37220301: Allow broadcasts with permissions to not be restricted" into oc-dev 2017-04-12 21:10:03 +00:00
Shuo Qian
36611a0958 Merge "ECBM SystemProperty cleanup" am: 4718606368 
am: 40cde7b71f

Change-Id: I51ec750ff1833b1982d8fdc1995c1d8d29b36976
 2017-04-12 21:06:20 +00:00
Selim Gurun
c68b1a8aef Merge "Deprecate findAddress() method" into oc-dev 2017-04-12 21:05:07 +00:00
Shuo Qian
40cde7b71f Merge "ECBM SystemProperty cleanup" 
am: 4718606368

Change-Id: Ie6b43fd0a0bfa7c813960d1bb53b7b57a4f82721
 2017-04-12 21:00:50 +00:00
TreeHugger Robot
39c3d2cf16 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev 2017-04-12 21:00:25 +00:00
Android Build Merger (Role)
9a5d047750 Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp 
* changes:
  Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b am: 176bfb58c6 am: a237a34085
  IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35 am: 9c2428ad4d am: 99c50add4f
 2017-04-12 20:54:59 +00:00
nharold
37f48f4596 Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b am: 176bfb58c6 
am: a237a34085

Change-Id: Ie868985d20535f35b869730a4ddaa00dc88a352d
 2017-04-12 20:53:17 +00:00
Seigo Nonaka
69754bf66d Introduce FontsContract.fetchFonts and expose URI for watching. 
FontsContract.fetchFonts provides a low level font access with fonts
provider.
This CL also includes:
- Introduce new class FontFamilyResult/Font as the inner static class
of FontsContract which are used to for result value of fetchFont..
- Introduce a functionality to FontsContract to be able to create
Typeface from an array of FontResult.
- Expose URI of each file entries to be able to register ContentObserver

Bug: 36494487
Bug: 36085028
Test: android.provider.FontsContract passes
Test: android.graphics.cts.TypefaceTest passes
Test: android.graphics.fonts.cts.FontResultTest passes

Change-Id: Id6f85039d0e86be063ef099d7ec6bfd97e4424c5
 2017-04-12 13:52:37 -07:00
Shuo Qian
4718606368 Merge "ECBM SystemProperty cleanup" 2017-04-12 20:52:20 +00:00
Nathan Harold
3fa4a92b8c IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35 am: 9c2428ad4d 
am: 99c50add4f

Change-Id: I49641308cd0f2ce3e8a7545c8b03108d69287c64
 2017-04-12 20:51:41 +00:00
Jason Monk
5881209cac Merge "Make QS light" into oc-dev 
am: 755138bb1c

Change-Id: I2a76725f4fb4edb0fa478619b28498c9bfc490ac
 2017-04-12 20:50:32 +00:00
Adam Lesinski
d11c5510b1 OMS: Fix bug where overlay settings wouldn't persist 
The dead user check was using a List.removeAll() call to find
the subset of users that have been removed and need deleting
from the overlay settings. The target class, UserInfo, does not
implement equals(), therefore no UserInfos would be removed from
the set and all user IDs would be candidates for deleting.

This change avoids the UserInfo class entirely and manipulates userIds.

Bug: 36099320
Test: Pick a theme and reboot.
Test: Theme should still be applied on next boot.
Change-Id: I1ee57839515460bf578664dfe1bd67df7d10d041
 2017-04-12 13:49:13 -07:00
TreeHugger Robot
755138bb1c Merge "Make QS light" into oc-dev 2017-04-12 20:43:16 +00:00