Neil Fuller
36eaefa9cc
Merge "Be more explicit about users"
2017-09-27 09:30:28 +00:00
Chalard Jean
a11a4c7198
Merge "Do not throw on call to isTetheringSupported w/o permission" into oc-mr1-dev am: e545f00e10
...
am: 47cfcef09c
Change-Id: I9eb78b72bdf043e4917f6d0d7495b65cfa1114db
2017-09-27 02:21:11 +00:00
Chalard Jean
47cfcef09c
Merge "Do not throw on call to isTetheringSupported w/o permission" into oc-mr1-dev
...
am: e545f00e10
Change-Id: Ib5b17a7f68c1327f47fe1f54c0454c51f4226907
2017-09-27 02:12:24 +00:00
Chalard Jean
e545f00e10
Merge "Do not throw on call to isTetheringSupported w/o permission" into oc-mr1-dev
2017-09-27 02:04:33 +00:00
Felipe Leme
3ce370a98c
Merge "Added missing quote (") on anchor tag." into oc-mr1-dev am: 7c112b733c
...
am: 33b907f6b0
Change-Id: I0e4382cdda9d5be28542d8cb8a4762b5b5513e0c
2017-09-26 23:51:48 +00:00
Felipe Leme
33b907f6b0
Merge "Added missing quote (") on anchor tag." into oc-mr1-dev
...
am: 7c112b733c
Change-Id: I1f51b9217766be19c83001f052bc6f698b050ca9
2017-09-26 23:42:37 +00:00
Felipe Leme
7c112b733c
Merge "Added missing quote (") on anchor tag." into oc-mr1-dev
2017-09-26 23:35:41 +00:00
nharold
a61d0899de
Merge changes from topic "re-enable-ipsec" am: 680525c742 am: 8d306cd78a am: 80107540bb
...
am: 80b90ed99a
Change-Id: Idffe4296539c6f0db00ce3ec2e5241224ece39b4
2017-09-26 22:49:36 +00:00
Nathan Harold
7bbe9c70f3
Re-Enable Starting of the IpSecService am: b72821747c am: f434a6d308 am: 686a8282bb
...
am: 458b8cd302
Change-Id: Ic492c58b8c9b56f870c99336e82fd8d05c9e8969
2017-09-26 22:48:25 +00:00
nharold
80b90ed99a
Merge changes from topic "re-enable-ipsec" am: 680525c742 am: 8d306cd78a
...
am: 80107540bb
Change-Id: I13a7134864a648aff9338fda044b3bffd653119e
2017-09-26 22:39:01 +00:00
Nathan Harold
458b8cd302
Re-Enable Starting of the IpSecService am: b72821747c am: f434a6d308
...
am: 686a8282bb
Change-Id: Ia24348d585b2f1050dafd161eafcdadf0edd82c0
2017-09-26 22:37:44 +00:00
nharold
80107540bb
Merge changes from topic "re-enable-ipsec" am: 680525c742
...
am: 8d306cd78a
Change-Id: I4e712a0d17618ca93cf6032b59ce8be0c8e0bfee
2017-09-26 22:24:02 +00:00
Nathan Harold
686a8282bb
Re-Enable Starting of the IpSecService am: b72821747c
...
am: f434a6d308
Change-Id: I328841b57df6f216c0e4b0aa0c1df923c606a885
2017-09-26 22:22:42 +00:00
nharold
8d306cd78a
Merge changes from topic "re-enable-ipsec"
...
am: 680525c742
Change-Id: Ia1d1f3981a9dd1eb8f60631d318211daf135d575
2017-09-26 22:13:20 +00:00
Nathan Harold
f434a6d308
Re-Enable Starting of the IpSecService
...
am: b72821747c
Change-Id: I1f64aa2fdf1cce6dea91427eda65c4b8ee6f6b02
2017-09-26 22:11:58 +00:00
Doris Liu
1ff15a9618
Merge "Fix crash when creating a HW Bitmap on a detached view" into oc-mr1-dev am: 701bb5b754
...
am: e87caf2e92
Change-Id: I3e87ad8958ce0a696593f0d771c492634f6703d4
2017-09-26 22:01:04 +00:00
Doris Liu
e87caf2e92
Merge "Fix crash when creating a HW Bitmap on a detached view" into oc-mr1-dev
...
am: 701bb5b754
Change-Id: Ie19e9de91eb3152eff0d92af573e95d1801d939a
2017-09-26 21:53:41 +00:00
Doris Liu
701bb5b754
Merge "Fix crash when creating a HW Bitmap on a detached view" into oc-mr1-dev
2017-09-26 21:46:42 +00:00
nharold
680525c742
Merge changes from topic "re-enable-ipsec"
...
* changes:
Re-Expose IpSecService API Surface
Re-Enable Starting of the IpSecService
2017-09-26 21:46:39 +00:00
Felipe Leme
a821efeeb7
Added missing quote (") on anchor tag.
...
Test: 'm -j doc-comment-check-docs' then verify resulting HTML
Fixes: 66958057
Change-Id: Ie5914a5af191866404b6fbf244c78e145c59a8b1
2017-09-26 13:06:41 -07:00
TreeHugger Robot
68945491e0
Merge "WebView: add @Nullable and @NonNull annotations"
2017-09-26 19:44:00 +00:00
Phil Weaver
d17e402a7e
Merge "Add null check in a11y callback" into oc-mr1-dev am: 4dfeb4f0e4
...
am: 0e8e7830fc
Change-Id: I88c8d335a4b91072d5e9bfcc4c2a7b21ec46565b
2017-09-26 19:38:44 +00:00
Phil Weaver
0e8e7830fc
Merge "Add null check in a11y callback" into oc-mr1-dev
...
am: 4dfeb4f0e4
Change-Id: Ibadc5f3fa1b2cd67998215a132f73bde7f1f4511
2017-09-26 19:30:28 +00:00
Phil Weaver
4dfeb4f0e4
Merge "Add null check in a11y callback" into oc-mr1-dev
2017-09-26 19:22:51 +00:00
TreeHugger Robot
f2b265978c
Merge "Fixing wrong actions were written to parcel when copying"
2017-09-26 19:04:56 +00:00
TreeHugger Robot
f3149fd352
Merge "Pass dumpsys priority to IServiceManager"
2017-09-26 19:01:10 +00:00
Kweku Adams
2cdb576a5a
Merge "incidentd: creating PolicyProto for NotificationManager"
2017-09-26 18:38:35 +00:00
Sunny Goyal
0ebf88133a
Fixing wrong actions were written to parcel when copying
...
Bug: 66901470
Test: Manual and CTS
Change-Id: I292e0e7d890d4da522045f434982aeeae35eb0fe
2017-09-26 16:44:12 +00:00
Charles He
e66a5bcac1
Merge "StatusBar: add DISABLE2_SYSTEM_ICONS flag"
2017-09-26 15:32:35 +00:00
Hans Boehm
6f0d970b2e
Merge "Naming fix and add comments" am: 3c03d5bd2b am: 24b9851605 am: 4a901144fe
...
am: c9532e8ac6
Change-Id: Ibe7d825b3b491cd9e5fb1ef07adaa9f71719e0dd
2017-09-26 13:03:11 +00:00
Peng Xu
00ae599474
Merge changes from topic "equalizer_1" am: 1ba697e29b am: 46f2249f46 am: 01ad27a0eb
...
am: b855edc41f
Change-Id: I499360f6cb7ecdf5c8580faf066c9ac0c0aea59a
2017-09-26 12:49:03 +00:00
Hans Boehm
c9532e8ac6
Merge "Naming fix and add comments" am: 3c03d5bd2b am: 24b9851605
...
am: 4a901144fe
Change-Id: I1e2446f67e0505d30edb230f2dde70855c9fe00c
2017-09-26 12:42:41 +00:00
Peng Xu
b855edc41f
Merge changes from topic "equalizer_1" am: 1ba697e29b am: 46f2249f46
...
am: 01ad27a0eb
Change-Id: Ie717da6b0e336701bdacc2949877bc0c1d71cb58
2017-09-26 12:38:01 +00:00
Hans Boehm
4a901144fe
Merge "Naming fix and add comments" am: 3c03d5bd2b
...
am: 24b9851605
Change-Id: Ib2f4ade384b33efc5d54374ce13e26e256f4c8d3
2017-09-26 12:23:12 +00:00
Peng Xu
01ad27a0eb
Merge changes from topic "equalizer_1" am: 1ba697e29b
...
am: 46f2249f46
Change-Id: Icd3c715dfed772d05b8314a394aad2725a9937e0
2017-09-26 12:17:39 +00:00
Hans Boehm
24b9851605
Merge "Naming fix and add comments"
...
am: 3c03d5bd2b
Change-Id: Ib35c874f56f87757904553ceeffb4d363eff196e
2017-09-26 11:12:19 +00:00
Peng Xu
46f2249f46
Merge changes from topic "equalizer_1"
...
am: 1ba697e29b
Change-Id: I0b5dabe42c0ab59fab63ea653392dd4d99b7d967
2017-09-26 11:07:28 +00:00
Chalard Jean
8f76fc38ec
Do not throw on call to isTetheringSupported w/o permission
...
...just return false instead. This will change in P.
Test: Made an app to test this. Made sure it doesn't have
Test: the required permission. Checked it crashes with
Test: SecurityException without this change. Checked it
Test: doesn't with it.
Bug: 65404184
Change-Id: Id20d3c240ec5d70d085e0366b92ab3a514f3e7c8
2017-09-26 19:25:48 +09:00
Doris Liu
4dc1ec754c
Fix crash when creating a HW Bitmap on a detached view
...
BUG: 65160121
Test: Unable to repro the crash before or after the fix
Change-Id: I84fa28557c67a6672b8d82443d4da7be4f28a50d
2017-09-25 17:21:48 -07:00
Kweku Adams
5ec78cd58f
incidentd: creating PolicyProto for NotificationManager
...
The previous code saved a String in the proto like
"NotificationManager.Policy[priorityCategories=PRIORITY_CATEGORY_REMINDERS,PRIORITY_CATEGORY_EVENTS,PRIORITY_CATEGORY_MESSAGES,PRIORITY_CATEGORY_CALLS,PRIORITY_CATEGORY_REPEAT_CALLERS,priorityCallSenders=PRIORITY_SENDERS_STARRED,priorityMessageSenders=PRIORITY_SENDERS_STARRED,suppressedVisualEffects=SUPPRESSED_EFFECT_SCREEN_OFF]".
This unfortunately would mean that the String would have to be parsed on
the server-side, which kinda defeats the purpose of migrating to protos,
so I made a proto for this :)
BUG: 65750824
Test: flash device and check incident.proto output, comparing it to the previous output
Change-Id: I87607dc7b72ce3519132da23167b4bdce3b7ef4c
2017-09-25 16:33:44 -07:00
Svet Ganov
c2840f9f9f
Merge "Hide autofill popup if anchor removed" into oc-mr1-dev am: 8e5e30c5eb
...
am: 89934be670
Change-Id: Idc925398f0b28ffe7220634cd9b74fba22de7278
2017-09-25 22:41:17 +00:00
Svet Ganov
89934be670
Merge "Hide autofill popup if anchor removed" into oc-mr1-dev
...
am: 8e5e30c5eb
Change-Id: Idd876a073c90f1b87f23e09b1993dc723eb6bdd5
2017-09-25 22:30:07 +00:00
TreeHugger Robot
8e5e30c5eb
Merge "Hide autofill popup if anchor removed" into oc-mr1-dev
2017-09-25 22:24:25 +00:00
Sudheer Shanka
f39df68b71
Merge "Add shutdown reason as extra when triggering ACTION_REQUEST_SHUTDOWN."
2017-09-25 20:42:52 +00:00
Charles He
6a79b0dff1
StatusBar: add DISABLE2_SYSTEM_ICONS flag
...
Add a StatusBarManager flag to control the visibility of system icons
such as connectivity info, battery, etc. Note that the clock is
controlled separately through DISABLE_CLOCK.
Also note that this flag differs from DISABLE_SYSTEM_INFO, which
controls the system icons and the clock as a whole, but only works for
the collapsed status bar (CollapsedStatusBarFragment).
Bug: 65813398
Test: runtest systemui
Test: manual, by using a modified version of TestDPC and
DevicePolicyManagerService
Change-Id: Icb61c7bb1a625edd818be7a66d7f15c3e812237b
2017-09-25 21:29:27 +01:00
Adrian Roos
f2ebc40286
Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev am: 73c93f02f7
...
am: 392a9b5c1d
Change-Id: Ifeb044d767b03c799fa028e6efc967b88fae7b53
2017-09-25 18:47:59 +00:00
Adrian Roos
392a9b5c1d
Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev
...
am: 73c93f02f7
Change-Id: I647bfc52892b305eb59f446812e142b609172bd4
2017-09-25 18:38:23 +00:00
Adrian Roos
73c93f02f7
Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev
2017-09-25 18:33:01 +00:00
Sudheer Shanka
292637f51a
Add shutdown reason as extra when triggering ACTION_REQUEST_SHUTDOWN.
...
When BatteryService triggers ACTION_REQUEST_SHUTDOWN intent, add the reason
for shutdown as extra to indicate low battery or critical battery
thermal state.
Bug: 63736262
Test: 1/ adb shell cmd battery unplug && adb shell cmd battery set level 0
2/ Power on the device
3/ Verify sys.boot.reason == shutdown,battery
Test: 1/ adb shell cmd battery set temp 700
2/ Power on the device
3/ Verify sys.boot.reason == shutdown,thermal,battery
Change-Id: If20a36ef53f8bcbfae4114df08f741ec1dcd7df9
2017-09-25 11:20:37 -07:00
Vishnu Nair
0576819519
Pass dumpsys priority to IServiceManager
...
Modify IServiceManager to accept supported dumpsys priority as a bitmask
with NORMAL being the default priority. Change listServices to return
a list of services filtered by the priority or all services when the
priority is set to ALL.
BUG:27429130
Test: manual verification
Change-Id: If367ace2f37f918043f1b330568d8560676d9b78
2017-09-25 10:25:26 -07:00