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

314367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daichi Hirono
1737e10334 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 
am: 96907e6553

Change-Id: Ic121f5ca810d5d92cbe15dca38ef4c33ed8261d3
 2017-04-13 04:42:22 +00:00
TreeHugger Robot
96907e6553 Merge "Use Context#startForegroundService in MTP provider" into oc-dev 2017-04-13 04:36:50 +00:00
Fyodor Kupolov
9f3cf1a692 Merge "Report app data fixup and prepare timings" into oc-dev 
am: 1423ea3a45

Change-Id: I59bead1f8f0dd6a8cafe2ae564f028dd27dda222
 2017-04-13 04:13:44 +00:00
TreeHugger Robot
1423ea3a45 Merge "Report app data fixup and prepare timings" into oc-dev 2017-04-13 04:08:21 +00:00
Vladislav Kaznacheev
2679fe4e95 Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 
am: 0964a2d9fc

Change-Id: I800980c3c887dd722410b427b7912b254012effc
 2017-04-13 03:47:25 +00:00
TreeHugger Robot
0964a2d9fc Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev 2017-04-13 03:36:30 +00:00
Jocelyn Dang
ae624f3f0b Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev 
am: 78b3b2308c

Change-Id: Ie7e78b33cc17ef29eba1ecf304ddbd4b40c17074
 2017-04-13 02:58:37 +00:00
Jocelyn Dang
78b3b2308c Merge "Add set-mode command to turn battery saver mode on and off." into oc-dev 2017-04-13 02:50:52 +00:00
Sudheer Shanka
012ddf15c7 Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev 
am: 67e802dd5e

Change-Id: I88cacca1d3a576b69dc0aaa6806b6c2901afa696
 2017-04-13 01:59:13 +00:00
Sudheer Shanka
67e802dd5e Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev 2017-04-13 01:53:32 +00:00
Winson Chung
67004e209d Merge "Fix regression when removing task." into oc-dev 
am: efbcb0d2cc

Change-Id: I0f20de44ecbfab8a411e99623f407a4b7c6c6986
 2017-04-13 01:39:01 +00:00
Dianne Hackborn
bea817a712 Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev 
am: c62f0d7495

Change-Id: I87cbbdef2014cdc914b5165e68428aab2fa436c7
 2017-04-13 01:38:01 +00:00
TreeHugger Robot
efbcb0d2cc Merge "Fix regression when removing task." into oc-dev 2017-04-13 01:29:31 +00:00
TreeHugger Robot
c62f0d7495 Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev 2017-04-13 01:27:53 +00:00
Salvador Martinez
37393f92f3 Merge "Added strings for thermal shutdown warning" into oc-dev 
am: dc52fd3168

Change-Id: I6395ad5cb79712e6cb00bcc4996fecda6018b919
 2017-04-13 01:01:35 +00:00
TreeHugger Robot
dc52fd3168 Merge "Added strings for thermal shutdown warning" into oc-dev 2017-04-13 00:51:25 +00:00
Wale Ogunwale
651a2970e6 Merge "Dump controller for AppWindowToken" into oc-dev 
am: b74567dd3b

Change-Id: I1c166eb1c7ad36396d7a463549d0ab1f9daebb61
 2017-04-13 00:49:12 +00:00
Wale Ogunwale
c1cb7039b1 Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev 
am: 343cf6e920

Change-Id: I05de9ee69443ebcae221736a1d4bcb94b89df00d
 2017-04-13 00:48:06 +00:00
TreeHugger Robot
b74567dd3b Merge "Dump controller for AppWindowToken" into oc-dev 2017-04-13 00:43:42 +00:00
Wale Ogunwale
343cf6e920 Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev 2017-04-13 00:39:16 +00:00
Wale Ogunwale
919a05d4a3 Revert "Ensure visible activities when device is unlocked." 
Causes issues with window life-cycle...

Bug: 37119770
Bug: 37244415
Bug: 37281544
This reverts commit 7004a8801d0a60013681a86043bab74b4d42d680.

Change-Id: I0039db6e44488cd82ef745aa979bc8549fd8aeed
 2017-04-13 00:36:34 +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
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
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
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
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
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
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
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
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