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

50827 Commits

Author SHA1 Message Date
Sudheer Shanka
911abd9bcf Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev am: 67e802dd5e 
am: 012ddf15c7

Change-Id: Ic491c87920519ac0fc04353f62f02a45dc1ba5fc
 2017-04-13 02:05:17 +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
3ab2d3328e Merge "Fix regression when removing task." into oc-dev am: efbcb0d2cc 
am: 67004e209d

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

Change-Id: I58010d9417177fed45d01a5c9498aa38cc3c2566
 2017-04-13 01:47:43 +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
Wale Ogunwale
23e60637ea Merge "Dump controller for AppWindowToken" into oc-dev am: b74567dd3b 
am: 651a2970e6

Change-Id: I1b116104494c3c3797c9a6d6277e6ae668f5d232
 2017-04-13 00:58:29 +00:00
Wale Ogunwale
5f9af8362b Merge "Revert "Ensure visible activities when device is unlocked."" into oc-dev am: 343cf6e920 
am: c1cb7039b1

Change-Id: I7367e0f6b347c957ce6a6439c31ab657876930c2
 2017-04-13 00:57:31 +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
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
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
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
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
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
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
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
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
TreeHugger Robot
c240c9b134 Merge "clear calling identity before calling settings provider" into oc-dev 2017-04-12 22:09:24 +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
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
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
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
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
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
672fa5f834 Merge "Fill UI polish" into oc-dev am: c9a83326c2 
am: 400f10fe50

Change-Id: Iabc6c0673960d8fee59d78e549ea04826064c37e
 2017-04-12 21:30:44 +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
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
TreeHugger Robot
a402d6dd2f Merge "Add autofill feature API" into oc-dev 2017-04-12 21:17:33 +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
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
Wale Ogunwale
9c64cb6a72 Dump controller for AppWindowToken 
To help with debugging.

Bug: 36097078
Test: N/A
Change-Id: I72108b918d839b67efe8b8eed65a33775bd94dbc
 2017-04-12 13:39:59 -07:00
Todd Kennedy
455b742bb6 Merge "Allow instant app resolution for any user" into oc-dev 
am: e7b806e9d2

Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d
 2017-04-12 20:00:09 +00:00
Jesse Evans
3d1676cfc4 Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev 
am: 684b5381e9

Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642
 2017-04-12 19:52:07 +00:00
TreeHugger Robot
e7b806e9d2 Merge "Allow instant app resolution for any user" into oc-dev 2017-04-12 19:45:55 +00:00
Jaewan Kim
e391fe76e8 Merge "Add documentation for 'am start-foreground-service'" into oc-dev 
am: e7ce1d40e1

Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e
 2017-04-12 19:45:21 +00:00