Tamas Berghammer
41ec732bb1
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp am: 3db5d42f90
...
am: 1a2a860d2c
2017-01-18 20:02:42 +00:00
Tamas Berghammer
7df8cb66a7
Merge "Update package names to work with the proto3 compiler am: cbd3f0c59a -s ours" into nyc-mr2-dev-plus-aosp
...
am: 391ab8caaa
2017-01-18 19:58:06 +00:00
Tamas Berghammer
6c5acde1ff
Update package names to work with the proto3 compiler am: cbd3f0c59a -s ours
...
am: 2c8d6c4c39
2017-01-18 19:55:14 +00:00
TreeHugger Robot
10868fd79a
Merge "Validate custom pointer icons aren't null."
2017-01-18 19:44:58 +00:00
Adrian Roos
64f13a56a4
Merge changes Ib6de3aa3,Idc46d1b2,I889e3864,I9a50ee57,I411f08ae, ...
...
* changes:
AOD: Use heads-up state instead of buzzBeepBlinked
AOD: Do not animate shelf icons when changing ambientness
AOD: Show ambient versions of notifications
AoD: Reposition shelf under clock
AoD: Adjust shelf, only show top notification
AoD: Adjust clock layout
2017-01-18 19:34:38 +00:00
Rebecca Silberstein
b7a77d24a6
Merge "SystemServer: reorder wifi services start"
2017-01-18 18:53:58 +00:00
TreeHugger Robot
b9cb9000c0
Merge "Execute non-optimized add operations one at a time."
2017-01-18 18:27:09 +00:00
TreeHugger Robot
1280b310f9
Merge "System API for a proxy for registered players"
2017-01-18 18:19:32 +00:00
Selim Cinek
c4a113abc1
Merge "Fixed a crash when showing guts"
2017-01-18 18:11:13 +00:00
Michael Wright
b004b5137e
Validate custom pointer icons aren't null.
...
Bug: 33853287
Test: cts
Change-Id: I844a9aec6e37e306a77eee0644a774f6470cf5df
2017-01-18 18:09:29 +00:00
Tamas Berghammer
1a2a860d2c
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
...
am: 3db5d42f90
2017-01-18 18:06:43 +00:00
Kenny Guy
7d02f6663a
Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed am: 1894632864 am: 748e78bd2c
...
am: 7f00eb6e90
2017-01-18 18:02:38 +00:00
Android Build Merger (Role)
391ab8caaa
Merge "Update package names to work with the proto3 compiler am: cbd3f0c59a -s ours" into nyc-mr2-dev-plus-aosp
2017-01-18 18:02:05 +00:00
TreeHugger Robot
e247432035
Merge "Fix test DevicePolicyManagerTest#testSetRequiredStrongAuthTimeout_DeviceOwner"
2017-01-18 17:58:04 +00:00
Kenny Guy
7f00eb6e90
Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed am: 1894632864
...
am: 748e78bd2c
2017-01-18 17:55:04 +00:00
Kenny Guy
748e78bd2c
Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed
...
am: 1894632864
2017-01-18 17:47:02 +00:00
Tamas Berghammer
2c8d6c4c39
Update package names to work with the proto3 compiler
...
am: cbd3f0c59a
2017-01-18 17:44:23 +00:00
Kenny Guy
1894632864
Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af
...
am: ee9f03d1ed
2017-01-18 17:33:33 +00:00
Kenny Guy
ee9f03d1ed
Fix issue with saving admins before finishing loading. am: f98ed6863a
...
am: b275a205af
2017-01-18 17:27:10 +00:00
Bartosz Fabianowski
094119df3e
Merge "Allow system to retrieve permission grant state"
2017-01-18 17:25:49 +00:00
Bartosz Fabianowski
4b0624fee4
Allow system to retrieve permission grant state
...
To inform the user which apps were granted permissions by the admin,
the Settings app needs to access this information without being a DO/PO.
Bug: 32692748
Test: FrameworksServicesTests unit test
Change-Id: I3770ec6343b85be9c6f7655675ed6db5cb50612c
2017-01-18 18:22:50 +01:00
Brian Duddie
0dc14171a2
Merge "ContextHubService: Pass nanoapp header data explicitly"
2017-01-18 17:16:05 +00:00
Kenny Guy
b275a205af
Fix issue with saving admins before finishing loading.
...
am: f98ed6863a
2017-01-18 17:13:31 +00:00
Makoto Onuki
ca66f302a0
Merge "Add ProviderStatus.DATABASE_CREATION_TIMESTAMP"
2017-01-18 17:04:26 +00:00
Roozbeh Pournader
2d00c0952e
Merge "Update locale data from in-tree ICU"
2017-01-18 17:03:35 +00:00
Tucker Sylvestro
f07d408798
svc nfc should support watches too am: 1876583bfb am: eed0a7bf45
...
am: 93591413eb
2017-01-18 16:47:59 +00:00
Tucker Sylvestro
93591413eb
svc nfc should support watches too am: 1876583bfb
...
am: eed0a7bf45
2017-01-18 16:41:54 +00:00
Tucker Sylvestro
eed0a7bf45
svc nfc should support watches too
...
am: 1876583bfb
2017-01-18 16:34:50 +00:00
Michal Karpinski
d084ca5fad
Fix test DevicePolicyManagerTest#testSetRequiredStrongAuthTimeout_DeviceOwner
...
1) Started returning the default value for getLong() on SystemProperties mock
2) Added a test that the minimum timeout cannot be changed using a system
property on non-debuggable builds
3) Added new within range test for completeness.
4) Started using TimeUnit instead of ms constants.
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Bug: 34317979
Change-Id: I0409451ae39e74ec3d96a098042302291ec3408f
2017-01-18 16:25:17 +00:00
Greg Daniel
57b8eb3da0
Merge "Update hwui_unit_tests to support running with Vulkan backend."
2017-01-18 16:13:04 +00:00
Tucker Sylvestro
1876583bfb
svc nfc should support watches too
...
Check for both FEATURE_NFC and FEATURE_NFC_HOST_CARD_EMULATION in the
"svc nfc" command. Watches may only have the latter, but should still
support the nfc enable/disable command.
See b/24532713#comment7 for context.
Bug 32386425
Change-Id: I307798f00728c6b437aebfcf58115af7265e3692
2017-01-18 10:27:38 -05:00
TreeHugger Robot
9ecde44945
Merge "Handle multiprocess flag in WebView update service."
2017-01-18 15:19:43 +00:00
TreeHugger Robot
eec32e2d2d
Merge "Don't play notification audio in vibrate mode"
2017-01-18 14:56:48 +00:00
Greg Daniel
98c78dad19
Update hwui_unit_tests to support running with Vulkan backend.
...
Added Macros for RENDERTHREAD_TESTS which run these tests using specific backends.
RENDERTHREAD_TESTS - Runs OpenGL, SkiaGL, and SkiaVulkan
RENDERTHREAD_SKIA_TESTS - Runs SkiaGL and SkiaVulkan
RENDERTHREAD_OPENGL_TESTS - Runs OpenGL
Test: manual running of hwui_unit_tests
Change-Id: Ia7420ee7a38803a15e2d58394d14b38cae8208d3
2017-01-18 09:12:31 -05:00
Tamas Berghammer
3db5d42f90
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
2017-01-18 12:58:01 +00:00
TreeHugger Robot
2ec59897cf
Merge changes I01e81b9c,I532c2d74
...
* changes:
Add a listener when task snapshots change
When app dies, destroy snapshot
2017-01-18 12:17:45 +00:00
Kenny Guy
f98ed6863a
Fix issue with saving admins before finishing loading.
...
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug: 34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
(cherry picked from commit adbda7474c
2017-01-18 12:01:55 +00:00
Paul Duffin
112e7e007c
Merge "Add legacy-android-test target containing android.test classes" am: c20518139a am: 78af448c30 am: 2ac0e2a186
...
am: 93a897b3db
2017-01-18 11:45:21 +00:00
Paul Duffin
93a897b3db
Merge "Add legacy-android-test target containing android.test classes" am: c20518139a am: 78af448c30
...
am: 2ac0e2a186
2017-01-18 11:39:39 +00:00
Paul Duffin
2ac0e2a186
Merge "Add legacy-android-test target containing android.test classes" am: c20518139a
...
am: 78af448c30
2017-01-18 11:34:39 +00:00
Paul Duffin
78af448c30
Merge "Add legacy-android-test target containing android.test classes"
...
am: c20518139a
2017-01-18 11:30:04 +00:00
Paul Duffin
c20518139a
Merge "Add legacy-android-test target containing android.test classes"
2017-01-18 11:19:58 +00:00
Pavel Grafov
eaed75d923
Merge "Make ENSURE_VERIFY_APPS global even when set by PO."
2017-01-18 11:15:28 +00:00
Lorenzo Colitti
311c5d4854
Merge changes from topic 'net-update-mr2-dev-plus-aosp' into nyc-mr2-dev-plus-aosp
...
am: 5db17efcf6
2017-01-18 10:51:20 +00:00
Hugo Benichi
0aef77c7f6
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
...
am: 7a61361724
2017-01-18 10:51:11 +00:00
Lorenzo Colitti
1bce615a62
DO NOT MERGE: Add missing dependency.
...
am: d9409d3b60
2017-01-18 10:50:13 +00:00
Tony Mak
a24817775c
DO NOT MERGE: Show notification for always-on app VPN
...
am: b31b83377b
2017-01-18 10:49:08 +00:00
Stephen Chen
1439b5bcdb
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
...
am: c926b7399a
2017-01-18 10:48:16 +00:00
Hugo Benichi
deb8944fc4
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
...
am: bccd8ad00a
2017-01-18 10:47:07 +00:00
Hugo Benichi
1fd377c424
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
...
am: de7002ef0d
2017-01-18 10:46:07 +00:00
