TreeHugger Robot
f594c62ec2
Merge "Change SystemApi as per API council feedback"
2017-08-11 14:41:20 +00:00
Esteban Talavera
74751119ca
Merge "Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours am: b6ba151a6f -s ours am: f4e45257c8 -s ours" into oc-mr1-dev-plus-aosp
...
am: 057da39d89
2017-08-11 13:24:03 +00:00
Esteban Talavera
5d39f66ef2
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours am: b6ba151a6f -s ours am: d9d5d43f89 -s ours
...
am: ff19365761
2017-08-11 13:19:35 +00:00
Esteban Talavera
a714065024
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 am: e50bea8662 -s ours am: 4879880724 -s ours
...
am: 84c9c5c400
2017-08-11 13:09:12 +00:00
Android Build Merger (Role)
057da39d89
Merge "Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours am: b6ba151a6f -s ours am: f4e45257c8 -s ours" into oc-mr1-dev-plus-aosp
2017-08-11 13:07:27 +00:00
Esteban Talavera
5abd1c731b
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours am: b6ba151a6f -s ours
...
am: f4e45257c8
2017-08-11 13:03:01 +00:00
Esteban Talavera
ff19365761
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours am: b6ba151a6f -s ours
...
am: d9d5d43f89
2017-08-11 13:03:00 +00:00
Esteban Talavera
84c9c5c400
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 am: e50bea8662 -s ours
...
am: 4879880724
2017-08-11 12:54:40 +00:00
Esteban Talavera
f4e45257c8
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours
...
am: b6ba151a6f
2017-08-11 12:50:36 +00:00
Esteban Talavera
d9d5d43f89
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours
...
am: b6ba151a6f
2017-08-11 12:50:34 +00:00
Esteban Talavera
4879880724
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3
...
am: e50bea8662
2017-08-11 12:42:59 +00:00
Neil Fuller
8bb4140516
Change SystemApi as per API council feedback
...
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.
This is the first of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the
constant.
Bug: 64568899
Test: None, build only
Change-Id: Ib9766591979886d1db3b1d7321536dabf5cf81a8
2017-08-11 13:35:46 +01:00
Esteban Talavera
e50bea8662
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
...
am: 49bef543b3
2017-08-11 12:34:06 +00:00
Esteban Talavera
b6ba151a6f
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
...
am: 49bef543b3
2017-08-11 12:34:00 +00:00
Adrian Roos
2d81d157a9
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev am: 3d558d8dd8
...
am: 8eecb09d40
2017-08-11 12:33:58 +00:00
TreeHugger Robot
49bef543b3
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
2017-08-11 12:25:01 +00:00
Adrian Roos
8eecb09d40
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
...
am: 3d558d8dd8
2017-08-11 12:20:21 +00:00
TreeHugger Robot
3d558d8dd8
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
2017-08-11 12:10:46 +00:00
Tony Mak
38b0d5881c
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev am: 106dc34fb2
...
am: 5d5d865dc8
2017-08-11 11:04:27 +00:00
Tony Mak
5d5d865dc8
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
...
am: 106dc34fb2
2017-08-11 10:51:49 +00:00
TreeHugger Robot
106dc34fb2
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
2017-08-11 10:42:24 +00:00
Philipp Weiß
572a5618b0
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS"
2017-08-11 10:21:51 +00:00
Christofer Åkersten
c222109a61
Merge "Remove preloaded media route resources" into oc-mr1-dev am: a6d62d7b8d
...
am: 37e9acb65a
2017-08-11 04:13:30 +00:00
Fyodor Kupolov
ef03b0d891
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev am: 0ee1e6d3c1
...
am: a468827851
2017-08-11 04:09:21 +00:00
Kevin Chyn
3b59301eae
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437 am: acdaaea57e" into oc-mr1-dev-plus-aosp
...
am: 0650482c2d
2017-08-11 03:58:34 +00:00
Kevin Chyn
b028ddb306
Merge "Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437" into oc-dr1-dev-plus-aosp am: fa6fb4c068" into oc-mr1-dev-plus-aosp
...
am: a45277bb2a
2017-08-11 03:54:25 +00:00
Sudheer Shanka
4d2f695c3e
Merge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev am: 3cb64c2c51" into oc-mr1-dev-plus-aosp
...
am: ffb30680aa
2017-08-11 03:50:40 +00:00
Brad Ebinger
59ab29ddd4
Merge "Merge "Change IMS callback AIDLs to be oneway" am: a46600e0e7 am: 44da663308 am: c6edfb16ac -s ours am: d061c2dde0 -s ours" into oc-mr1-dev-plus-aosp
...
am: 0778f438a1
2017-08-11 03:43:49 +00:00
Kevin Chyn
25b7c3509a
Merge "FP permission checks should not crash system process" into oc-mr1-dev am: 5f2ba81c06
...
am: cc5c844c1f
2017-08-11 03:39:17 +00:00
Steven Moreland
3c9d4f05d0
Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp am: 1e8d712b78
...
am: 350b0ed191
2017-08-11 03:34:50 +00:00
Brad Ebinger
4b6b2264c3
Merge "Add method that checks the Binder status of ImsConfig" am: 6ffc855e8d am: bc13df8ce8 am: 3fff521160 -s ours am: f4f815c2cb -s ours
...
am: ad7e491494
2017-08-11 03:26:36 +00:00
Sudheer Shanka
8518991995
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev am: 06668b5f73
...
am: d732136ed1
2017-08-11 03:22:38 +00:00
Phil Weaver
d09b7199e3
Merge "Merge "Stop focusing views before layout." into oc-dr1-dev am: a5dab05b61 am: 2436cb76b9" into oc-mr1-dev-plus-aosp
...
am: 88f3cb403e
2017-08-11 03:18:57 +00:00
Christofer Åkersten
37e9acb65a
Merge "Remove preloaded media route resources" into oc-mr1-dev
...
am: a6d62d7b8d
2017-08-11 03:10:54 +00:00
TreeHugger Robot
52e94c33bd
Merge "resolve merge conflicts of b90e2c85c0 to master"
2017-08-11 03:04:02 +00:00
TreeHugger Robot
a6d62d7b8d
Merge "Remove preloaded media route resources" into oc-mr1-dev
2017-08-11 03:00:21 +00:00
TreeHugger Robot
1429b73a5d
Merge "Update GeomagneticField parameters according to WMM-2015"
2017-08-11 02:43:53 +00:00
Sudheer Shanka
6ebc3c8da1
Merge "Update NPMS.setRestrictBackgroundUL to notify listeners."
2017-08-11 01:40:44 +00:00
Fyodor Kupolov
a468827851
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
...
am: 0ee1e6d3c1
2017-08-11 01:38:24 +00:00
Sudheer Shanka
99f76da6f7
Merge "Update network rules only for the added/removed appId in the whitelist."
2017-08-11 01:36:29 +00:00
Android Build Merger (Role)
0650482c2d
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437 am: acdaaea57e" into oc-mr1-dev-plus-aosp
2017-08-11 01:32:30 +00:00
TreeHugger Robot
0ee1e6d3c1
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
2017-08-11 01:28:01 +00:00
Android Build Merger (Role)
a45277bb2a
Merge "Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437" into oc-dr1-dev-plus-aosp am: fa6fb4c068" into oc-mr1-dev-plus-aosp
2017-08-11 01:27:39 +00:00
Kevin Chyn
575027f9af
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437
...
am: acdaaea57e
2017-08-11 01:26:47 +00:00
Kevin Chyn
c1a30d507c
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437" into oc-dr1-dev-plus-aosp
...
am: fa6fb4c068
2017-08-11 01:22:43 +00:00
Android Build Merger (Role)
ffb30680aa
Merge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev am: 3cb64c2c51" into oc-mr1-dev-plus-aosp
2017-08-11 01:22:10 +00:00
Android Build Merger (Role)
0778f438a1
Merge "Merge "Change IMS callback AIDLs to be oneway" am: a46600e0e7 am: 44da663308 am: c6edfb16ac -s ours am: d061c2dde0 -s ours" into oc-mr1-dev-plus-aosp
2017-08-11 01:20:05 +00:00
Sudheer Shanka
76974ee41e
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
...
am: 3cb64c2c51
2017-08-11 01:18:34 +00:00
Brad Ebinger
16ea828638
Merge "Change IMS callback AIDLs to be oneway" am: a46600e0e7 am: 44da663308 am: c6edfb16ac -s ours
...
am: d061c2dde0
2017-08-11 01:15:52 +00:00
Android Build Merger (Role)
fa6fb4c068
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437" into oc-dr1-dev-plus-aosp
2017-08-11 01:12:50 +00:00
