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
TreeHugger Robot
2cafa2db05 Merge "Remove support for auto-paging of cursors." 2017-04-13 00:32:05 +00:00
Chad Brubaker
9e6bb31110 Merge "Expose more settings to Instant Apps" into oc-dev am: 055b51af28 
am: a927a8c3ba

Change-Id: I3224b23298ad06cd6a75ae1a5d96f0690c7bccf3
 2017-04-13 00:22:49 +00:00
Evan Rosky
dc4792c10e Merge "Fix focus ordering with duplicate ids" into oc-dev am: a0ce440d60 
am: 33f6bcb71d

Change-Id: I06f4cc41131ca82c6bfb75fcd174741589d936a4
 2017-04-13 00:19:06 +00:00
Chad Brubaker
a927a8c3ba Merge "Expose more settings to Instant Apps" into oc-dev 
am: 055b51af28

Change-Id: I1bddeffc290009c2ebf34168dc9ba8b69fe81e98
 2017-04-13 00:11:16 +00:00
Martijn Coenen
441d61bf16 Add persistentFeature application attribute. 
This allows us to only mark processes as persistent
when a feature it actually depends on is present on
the device.

Also adds a "android.hardware.nfc.any" feature, to
indicate the device supports any of the NFC features
that require the NFC process to run persistently.

Bug: 36873979
Bug: 37269025
Test: NFC is still started on devices with NFC
Change-Id: I5792d75d8714f39718fa957177a632efcbbd37d3
 2017-04-12 17:09:37 -07:00
Evan Rosky
33f6bcb71d Merge "Fix focus ordering with duplicate ids" into oc-dev 
am: a0ce440d60

Change-Id: I05050c7d2078a21f86a096ebc65bc2d6d8b4aa6a
 2017-04-13 00:06:42 +00:00
Chad Brubaker
055b51af28 Merge "Expose more settings to Instant Apps" into oc-dev 2017-04-12 23:51:42 +00:00
Evan Rosky
a0ce440d60 Merge "Fix focus ordering with duplicate ids" into oc-dev 2017-04-12 23:50:04 +00:00
Roozbeh Pournader
252093e36f Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev am: d39388219f 
am: 4d56a0019a

Change-Id: Idbb6b973a9aa67c9454ed0f839de56fae109561b
 2017-04-12 23:49:15 +00:00
Rob Carr
41ac1d1c8b Merge "Fix auto-pip visibility issues." into oc-dev am: 7040f573f3 
am: 4c613520c3

Change-Id: Ifd2762e1d196b5f353d90a9612c1fcb55cc82976
 2017-04-12 23:47:53 +00:00
Jeremy Joslin
1e2595d792 Always call unbind. 
Per a recent discussion unbind should always be called, even if
bind() returns false.

Restructured the NetworkScoreService code to allow for easier and
more robust testing of the inner ServiceConnection class.

Bug: 36999204
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Change-Id: I08870b7109cb7f51cdab8b632b7d1d0898c3c015
 2017-04-12 16:47:00 -07:00
Lorenzo Colitti
23cbbe1c73 Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp 
am: a7e30062c9

Change-Id: I6500639ae839ee9ad5af34d1292d1539c943e2ad
 2017-04-12 23:45:57 +00:00
Jiaquan He
ffdbb07c91 Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev am: 18d993bb72 
am: 7ed2b1adeb

Change-Id: Ie92d455fdc43e627ef436191f8d72737b68c4d96
 2017-04-12 23:39:41 +00:00
Jiaquan He
caaba8c2b8 Draw a default focus highlight if needed. am: 8062949ece 
am: d415eac183  -s ours

Change-Id: I847beeafcdf68ce8228574e754bfd722ec89e0b8
 2017-04-12 23:38:12 +00:00
Roozbeh Pournader
4d56a0019a Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev 
am: d39388219f

Change-Id: Icae3c9b7166b4b83b31ad08bcd78db2205c916c1
 2017-04-12 23:37:03 +00:00
Jiaquan He
66da966c6b Add a public API defaultFocusHighlightEnabled. am: b7daaf8b5f 
am: 557922d37a

Change-Id: I84f82f570dbd32769c82be426bbbc184cc1f53ac
 2017-04-12 23:36:40 +00:00
Jiaquan He
bf084b1dc6 Detect unhandled keyboard focused state. am: 4a81674b45 
am: 4bd8bce6d7

Change-Id: I506ff2c909aa98f049d2f663a6cf714e3e06e6d6
 2017-04-12 23:35:40 +00:00
Roozbeh Pournader
d39388219f Merge "Revert "Make selection end handle stick to selection at line end."" into oc-dev 2017-04-12 23:22:40 +00:00
Dianne Hackborn
d5a8b43f8e Debugging issue #37272284: ActivityManager: SELinux tag not defined 
Add a little more info to the exception message.

Test: manual
Change-Id: I7ccbd5720d0e6c22a6caa9bfcb24cf40effde804
 2017-04-12 16:14:42 -07:00
Hyunyoung Song
92e3da2354 Update API, add more documentation on AdaptiveIconDrawable 
and fix multiple miscellaneous bugs.

Bug: 37079814
Bug: 37100106
Bug: 34829216

Test: $ runtest --path=frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java
Test: $ runtest --path=frameworks/base/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
Test: $ runtest --path=frameworks/base/core/tests/coretests/src/android/grpahics/drawable/AdaptiveIconDrawableTest.java

Change-Id: I0f5b2232853031bf3860ebea2736e894d17e4d2e
 2017-04-12 16:06:45 -07:00
Rob Carr
4c613520c3 Merge "Fix auto-pip visibility issues." into oc-dev 
am: 7040f573f3

Change-Id: I1ac9baf15ac5efc2262f4bcf6ba650b25d326ff9
 2017-04-12 23:03:12 +00:00
Android Build Merger (Role)
a7e30062c9 Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp 2017-04-12 23:00:13 +00:00
Lorenzo Colitti
c34f0f7520 Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 
am: cfd729093f

Change-Id: I7535495681da8f168c46d6d95e13925cffecc99b
 2017-04-12 22:58:42 +00:00
Jiaquan He
7ed2b1adeb Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev 
am: 18d993bb72

Change-Id: Ic8d6df348c0c3908e32ae8dc288ee48b5a731163
 2017-04-12 22:56:15 +00:00
Jiaquan He
d415eac183 Draw a default focus highlight if needed. 
am: 8062949ece

Change-Id: Ia06126f29168df05fe851746d86e15846ceca1b8
 2017-04-12 22:54:17 +00:00
Jiaquan He
557922d37a Add a public API defaultFocusHighlightEnabled. 
am: b7daaf8b5f

Change-Id: I189aea9c495255fe68f5af98a6d33bd87dc79e3e
 2017-04-12 22:53:09 +00:00
Jiaquan He
4bd8bce6d7 Detect unhandled keyboard focused state. 
am: 4a81674b45

Change-Id: I8c756acc96cab2d24c19f86c50266c2ef51b5494
 2017-04-12 22:51:56 +00:00
Tony Mak
e682acb20b Merge "clear calling identity before calling settings provider" into oc-dev am: c240c9b134 
am: a06e779bfe

Change-Id: Ie2baee0eb27b8c593227dc99e1191a5a44b4c500
 2017-04-12 22:51:35 +00:00
Lorenzo Colitti
cfd729093f Merge changes from topic 'network_specifier' am: d0f476bdae 
am: 362bef45d1

Change-Id: Iea17cb166f9c1bcec55cc8d404e00175aecb9918
 2017-04-12 22:48:55 +00:00
Rob Carr
7040f573f3 Merge "Fix auto-pip visibility issues." into oc-dev 2017-04-12 22:46:26 +00:00
Lorenzo Colitti
362bef45d1 Merge changes from topic 'network_specifier' 
am: d0f476bdae

Change-Id: I783b2d06f3a5e8b9cd7940f1f1ef0dd951c734f1
 2017-04-12 22:43:03 +00:00
TreeHugger Robot
18d993bb72 Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev 
* changes:
  Fix broken CTS tests.
  Draw a default focus highlight if needed.
  Add a public API defaultFocusHighlightEnabled.
  Detect unhandled keyboard focused state.
 2017-04-12 22:40:15 +00:00
Jocelyn Dang
f2c38c130f Add set-mode command to turn battery saver mode on and off. 
Affected test will be modified in ag/2101279

Test: adb shell cmd battery unplug && adb shell cmd power set-mode 0
Bug: 31944272
Change-Id: Ia88e7e164aa9b8b4d0ab51f607a64b35e2159273
 2017-04-12 15:39:03 -07:00
Amit Mahajan
aae7707efb Merge "Add p2 option in openLogicalChannel." into oc-dev am: 682ce66309 
am: 1c29bdda34

Change-Id: I31176c61432ed9efb999991745fc635b734e66ee
 2017-04-12 22:30:39 +00:00
Jakub Pawlowski
19d6662777 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b am: ce8de6c3f7 
am: 2ef7bb7b06

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

Change-Id: Iae5d6a6e9fd9d55fbd8a1403aed85e434245dcc6
 2017-04-12 22:28:10 +00:00
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
Svet Ganov
f75f8ba4a5 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 
am: ed0454fa80

Change-Id: Ieaf8c4e1619c18f226ab220d6029770d22275e56
 2017-04-12 22:27:09 +00:00
Julius D'souza
afa5e97db4 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 
am: be09e43773

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

Change-Id: Ic41bfe5a321faf090d9694acc299cccb706947db
 2017-04-12 22:24:54 +00:00
Julius D'souza
b825e9cd33 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886 am: f72dd4142b -s ours am: 3a967f92f2 
am: b19d94bf80

Change-Id: I7a6c5c8e108140564f0f4ff104501e9eb54cd83f
 2017-04-12 22:23:48 +00:00
Svet Ganov
cb98d9d6f3 Merge "Add autofill feature API" into oc-dev am: a402d6dd2f 
am: bbef731c2d

Change-Id: I3d1429fe4d101072200aae522a2bdf00596273de
 2017-04-12 22:22:39 +00:00
Dianne Hackborn
7ee8c9a485 Merge "Add API to get a uid's current importance." into oc-dev am: ad6ab44e15 
am: ef95ec85ea

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

Change-Id: Ib9c45438a8b140028c7e025f4c80ec2d29d9ebc0
 2017-04-12 22:20:25 +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
Dianne Hackborn
90975dc1fc Merge "Fix issue #37220301: Allow broadcasts with permissions to not be restricted" into oc-dev am: f74210c3a3 
am: 33e80232fc

Change-Id: I9a34336bac3636bb672bf640e4525ec24cd6f2f8
 2017-04-12 22:16:05 +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
Selim Gurun
d07efb9ce3 Merge "Deprecate findAddress() method" into oc-dev am: c68b1a8aef 
am: 24d68dc3d8

Change-Id: I3cacbe34c084eb6f98a141535293d5c783a9243b
 2017-04-12 22:12:57 +00:00
Shuo Qian
c77146ceb1 Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f am: 36611a0958 
am: 56d3af6680

Change-Id: Ida75e1835bc99a328baeee71b6838581800916b0
 2017-04-12 22:11:17 +00:00
TreeHugger Robot
c240c9b134 Merge "clear calling identity before calling settings provider" into oc-dev 2017-04-12 22:09:24 +00:00