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

315693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
nharold
5f676fa7b6 Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp 
am: 9a5d047750

Change-Id: I986d031a47a578fda9f61b58e401e7ff53e24bc3
 2017-04-12 21:43:27 +00:00
Jason Monk
6f23256544 Merge "Make QS light" into oc-dev am: 755138bb1c 
am: 5881209cac

Change-Id: Ife0be0ed4dade96bb42a64c39d022e0b84517d91
 2017-04-12 21:42:00 +00:00
Bill Yi
7218bdd562 Merge "Import translations. DO NOT MERGE" into oc-dev am: 88ab6c1304 -s ours 
am: 8c53d24399  -s ours

Change-Id: I13211570b6e817af73bade9bd26828b833892377
 2017-04-12 21:40:52 +00:00
Todd Kennedy
7d0b84e1df Merge "Allow instant app resolution for any user" into oc-dev am: e7b806e9d2 
am: 455b742bb6

Change-Id: I12b658529a580c1d29e7dc99f60b87ff048706a3
 2017-04-12 21:39:55 +00:00
Dianne Hackborn
81bfe1f62e Merge "Allow appops command to modify uid ops." into oc-dev 2017-04-12 21:37:52 +00:00
Seigo Nonaka
ecc3afd49a Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev am: 1e924df63e 
am: fa4b862518

Change-Id: I0aa32f46d20a5d46454f2a6057db2ca0e70f1d84
 2017-04-12 21:37:09 +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
Jesse Evans
93b7acddf8 Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev am: 684b5381e9 
am: 3d1676cfc4

Change-Id: I0cc0d165ad5bceb1d93cbe48030e347b53e3caf4
 2017-04-12 21:35:09 +00: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
Jaewan Kim
7cac2b0e7b Merge "Add documentation for 'am start-foreground-service'" into oc-dev am: e7ce1d40e1 
am: e391fe76e8

Change-Id: Ibf0d1a860cf8cece27f84bb2a9f0c5039ecfd03b
 2017-04-12 21:33:58 +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
Julia Reynolds
b0453ce03d Merge "Clear calling identity before verifying listeners" into oc-dev am: 43dd3ba3c4 
am: bf3f4dd7f5

Change-Id: Ib0285d815731cf3ef6ed4c06272584284d54209a
 2017-04-12 21:32:54 +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
Casey Burkhardt
1fa465be0d Merge "Improved multiuser support for A11y button/Magnification" into oc-dev am: 9aa64e6cfa 
am: 79bc410133

Change-Id: Ia5d0218553dd2a3d2f0a190f2d091e3180fe5773
 2017-04-12 21:31:48 +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
Svet Ganov
672fa5f834 Merge "Fill UI polish" into oc-dev am: c9a83326c2 
am: 400f10fe50

Change-Id: Iabc6c0673960d8fee59d78e549ea04826064c37e
 2017-04-12 21:30:44 +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
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
Steve McKay
4677c2b7f0 Remove support for auto-paging of cursors. 
Auto-paging of cursors is being removed in favor of a support lib component.
Rationale:
    1) Auto-paging as implemented has potential to negatively impact system health.
    2) Similar functionality w/o system health concerns can be provided
       specific to RecyclerView.

Test: Removed. CTS coverage updated.
Bug: 30927484
Change-Id: I43e62181d8ceeeba6265d44536967a2102751320
 2017-04-12 13:51:50 -07: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