OSDN Git Service
Fyodor Kupolov [Wed, 18 Jan 2017 22:42:42 +0000 (22:42 +0000)]
Merge "Updated platform privileged permissions"
Svet Ganov [Wed, 18 Jan 2017 22:41:24 +0000 (22:41 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours am:
79b20c88e2 -s ours
am:
e9838d9feb -s ours
Change-Id: I8352ee1a2396d483674dd3997b30e5772ad44f4e
Pavlin Radoslavov [Wed, 18 Jan 2017 22:40:03 +0000 (22:40 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34 am:
fd2f4bbcca am:
14e9d1c33f
am:
6878dd5dec
Change-Id: I6cc8135406d49cfd1035e4744b24733682d63f66
Tamas Berghammer [Wed, 18 Jan 2017 22:38:58 +0000 (22:38 +0000)]
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp am:
a553354e84
am:
c6e0e75534 -s ours
Change-Id: Iac5d3bde4481bc509ab21fe0979be0f1f2064110
Tamas Berghammer [Wed, 18 Jan 2017 22:38:09 +0000 (22:38 +0000)]
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am:
b4050d8042
am:
d331d57dc6 -s ours
Change-Id: Ie697d5efaea39e1522e947ac1a8f38f1443a1964
TreeHugger Robot [Wed, 18 Jan 2017 22:32:46 +0000 (22:32 +0000)]
Merge "Fixed check for generated ids on onProvideStructureForAssistOrAutoFill()."
TreeHugger Robot [Wed, 18 Jan 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Enable background restrictions"
Android Build Merger (Role) [Wed, 18 Jan 2017 22:27:50 +0000 (22:27 +0000)]
Merge changes from topic 'am-
4c35a7750ff942229896a20b4a9f05ce'
* changes:
DO NOT MERGE: Revert "Fix build" am:
a0a908f5d6 am:
0a1a0e6e61 -s ours
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am:
24d8553316 -s ours am:
572dfccfc1 -s ours
Tamas Berghammer [Wed, 18 Jan 2017 22:13:02 +0000 (22:13 +0000)]
DO NOT MERGE: Revert "Fix build" am:
a0a908f5d6
am:
0a1a0e6e61 -s ours
Change-Id: I9d4ecca39800413fa9eb483715bf810028d61334
Tamas Berghammer [Wed, 18 Jan 2017 22:12:04 +0000 (22:12 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am:
24d8553316 -s ours
am:
572dfccfc1 -s ours
Change-Id: I17090081cb6721124d3ba513f8d59f1982764cb8
Android Build Merger (Role) [Wed, 18 Jan 2017 22:10:14 +0000 (22:10 +0000)]
Merge "Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4 am:
d2f5fd3c42 am:
878fcfaa22 am:
424650dd52 -s ours"
Glen Kuhne [Wed, 18 Jan 2017 22:07:58 +0000 (22:07 +0000)]
Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4 am:
d2f5fd3c42 am:
878fcfaa22
am:
424650dd52 -s ours
Change-Id: I44bdf1deca8ef5daa4e7994d4ade884a94bb0178
Android Build Merger (Role) [Wed, 18 Jan 2017 22:07:20 +0000 (22:07 +0000)]
Merge "Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864 am:
c8a6eb1382 am:
7ede74bb06"
Kenny Guy [Wed, 18 Jan 2017 22:06:34 +0000 (22:06 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864 am:
c8a6eb1382
am:
7ede74bb06
Change-Id: Ifcace51e08196fdce59ebcc375136215b1e91079
Android Build Merger (Role) [Wed, 18 Jan 2017 22:06:11 +0000 (22:06 +0000)]
Merge "svc nfc should support watches too am:
1876583bfb am:
baa26e2d3d am:
9ece7d4509"
Tucker Sylvestro [Wed, 18 Jan 2017 22:05:20 +0000 (22:05 +0000)]
svc nfc should support watches too am:
1876583bfb am:
baa26e2d3d
am:
9ece7d4509
Change-Id: Ife740a3873073ae7b8a347983af2a986fbf9c83f
Android Build Merger (Role) [Wed, 18 Jan 2017 22:04:56 +0000 (22:04 +0000)]
Merge "Merge "Notify user switch event to NetworkController" am:
1aa24246cf am:
4ab0e9f824 am:
3f326e7011 am:
bddba11564"
Jay [Wed, 18 Jan 2017 22:04:22 +0000 (22:04 +0000)]
Merge "Notify user switch event to NetworkController" am:
1aa24246cf am:
4ab0e9f824 am:
3f326e7011
am:
bddba11564
Change-Id: Ibc3aa5c5c7217cdb67dc31d1f9417df48b55127c
Android Build Merger (Role) [Wed, 18 Jan 2017 22:03:56 +0000 (22:03 +0000)]
Merge "Fix build am:
005055c070 am:
655c5066c7"
Jason Monk [Wed, 18 Jan 2017 22:03:19 +0000 (22:03 +0000)]
Fix build am:
005055c070
am:
655c5066c7
Change-Id: Ibe49185028e33b0553928347b1d546404f09063f
Jason Monk [Wed, 18 Jan 2017 15:04:51 +0000 (10:04 -0500)]
Fix build
Test: treehugger
Change-Id: Ic33d5ff2d7845bf4edd81d3e966fce3f0e5956bb
(cherry picked from commit
005055c070a4e174a493fe585e467c0e711b96e9)
Jason Monk [Wed, 18 Jan 2017 22:00:03 +0000 (22:00 +0000)]
Merge "resolve merge conflicts of
8cff199b09d6 to master"
Makoto Onuki [Wed, 18 Jan 2017 21:30:17 +0000 (21:30 +0000)]
Merge "Support protofied dumpsys for NetStats"
Svet Ganov [Wed, 18 Jan 2017 21:13:48 +0000 (21:13 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am:
4a601f972a -s ours
am:
79b20c88e2 -s ours
Change-Id: I065da31e12dd71dc2ab8b8304a73cba7271568d3
Svet Ganov [Wed, 18 Jan 2017 21:04:21 +0000 (21:04 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am:
4a601f972a -s ours
Change-Id: I8798244ed83cab82094aed1705d719cf5c2188e4
Pavlin Radoslavov [Wed, 18 Jan 2017 20:42:33 +0000 (20:42 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34 am:
fd2f4bbcca
am:
14e9d1c33f
Change-Id: I243082e8553c97aa3b28d6e3e72e988136d305cc
Tamas Berghammer [Wed, 18 Jan 2017 20:33:44 +0000 (20:33 +0000)]
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
am:
a553354e84
Change-Id: I7e969a4988bdc01f21f09137cfe2f8e692101a3c
Tamas Berghammer [Wed, 18 Jan 2017 20:32:44 +0000 (20:32 +0000)]
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
am:
b4050d8042
Change-Id: I9d5789a9c4f12c12c5cc13eb8f92d3084a818440
Pavlin Radoslavov [Wed, 18 Jan 2017 20:30:44 +0000 (20:30 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
5fd543ec34
am:
fd2f4bbcca
Change-Id: I3c253b5ee444f23fc81dc607dcc85e95b2aa3226
TreeHugger Robot [Wed, 18 Jan 2017 20:30:15 +0000 (20:30 +0000)]
Merge "Fix tooltip handling for invisible and overlapping views"
TreeHugger Robot [Wed, 18 Jan 2017 20:29:41 +0000 (20:29 +0000)]
Merge "Fix pointer icon handling for invisible and overlapping views"
TreeHugger Robot [Wed, 18 Jan 2017 20:27:44 +0000 (20:27 +0000)]
Merge "Tron metrics for special permissions"
Pavlin Radoslavov [Wed, 18 Jan 2017 20:26:52 +0000 (20:26 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am:
5fd543ec34
Change-Id: I69c8396f015dc926c135a0284a347c6d6d8ca870
TreeHugger Robot [Wed, 18 Jan 2017 20:26:17 +0000 (20:26 +0000)]
Merge "Protect use of onFindViewById for Fragment Transitions."
Tamas Berghammer [Wed, 18 Jan 2017 20:23:54 +0000 (20:23 +0000)]
DO NOT MERGE: Revert "Fix build"
am:
a0a908f5d6
Change-Id: I3ba66290b49fbe184eff424f5e70b8f32ed6fb3e
Tamas Berghammer [Wed, 18 Jan 2017 20:22:57 +0000 (20:22 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am:
24d8553316 -s ours
Change-Id: I09a58385e10e135af06dff346624dcbc9eb76a4f
Treehugger Robot [Wed, 18 Jan 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
TreeHugger Robot [Wed, 18 Jan 2017 20:12:46 +0000 (20:12 +0000)]
Merge "Ensure correct install reason"
Jason Monk [Wed, 18 Jan 2017 20:09:42 +0000 (15:09 -0500)]
resolve merge conflicts of
8cff199b09d6 to master
Change-Id: Ie61ca1bb88eadff30599c1776201482173479183
Tamas Berghammer [Wed, 18 Jan 2017 20:02:42 +0000 (20:02 +0000)]
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp am:
3db5d42f90
am:
1a2a860d2c
Change-Id: I229a5c77a0dc5d75afc43669eb1d58d16f492844
Tamas Berghammer [Wed, 18 Jan 2017 19:59:50 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp
Tamas Berghammer [Wed, 18 Jan 2017 19:59:50 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
Tamas Berghammer [Wed, 18 Jan 2017 19:58:06 +0000 (19:58 +0000)]
Merge "Update package names to work with the proto3 compiler am:
cbd3f0c59a -s ours" into nyc-mr2-dev-plus-aosp
am:
391ab8caaa
Change-Id: I204d0beaf83bfb0b841d08aba3eb0f0101bbfaf1
Tamas Berghammer [Wed, 18 Jan 2017 19:55:14 +0000 (19:55 +0000)]
Update package names to work with the proto3 compiler am:
cbd3f0c59a -s ours
am:
2c8d6c4c39
Change-Id: I092a61abba417a71fe1a8eb9d29016e74808feb2
TreeHugger Robot [Wed, 18 Jan 2017 19:44:52 +0000 (19:44 +0000)]
Merge "Validate custom pointer icons aren't null."
Felipe Leme [Tue, 17 Jan 2017 17:36:59 +0000 (09:36 -0800)]
Fixed check for generated ids on onProvideStructureForAssistOrAutoFill().
BUG:
33197203
Test: CtsAutoFillServiceTestCases passes
Change-Id: I7dc45b2f68881e2a718b5d704ff4c3c3e5d9527b
Tamas Berghammer [Wed, 18 Jan 2017 16:36:46 +0000 (16:36 +0000)]
DO NOT MERGE: Revert "Fix build"
This reverts commit
005055c070a4e174a493fe585e467c0e711b96e9.
Change-Id: Ia71d1e95de48bc1d83a4924041953a2d42ed6a93
Adrian Roos [Wed, 18 Jan 2017 19:34:34 +0000 (19:34 +0000)]
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
Tamas Berghammer [Wed, 18 Jan 2017 16:17:32 +0000 (16:17 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit
cbd3f0c59a75e0b46dbb0635e81f82b8b9617791.
Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
Christopher Tate [Mon, 7 Nov 2016 20:21:21 +0000 (12:21 -0800)]
Enable background restrictions
Apps that target O+ are always subject to background restrictions.
Legacy apps' background restriction is subject to the OP_RUN_IN_BACKGROUND
app op.
Apps with these properties are exempted from background restrictions:
- persistent process
- currently on the idle battery whitelist
- global whitelist for things like bluetooth services
Bug
30953212
Change-Id: Ib444829a2d222125f64ff19e8218823fa78373f9
Svet Ganov [Tue, 17 Jan 2017 21:50:46 +0000 (13:50 -0800)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
Bug:
34193954
Change-Id: Id744fd190ef78e498e635c2ab9936f12d0bbc917
(cherry picked from commit
6130fb741c86d7d4f0f86e3a875c3eca1fe8aa51)
Pavlin Radoslavov [Tue, 17 Jan 2017 21:04:13 +0000 (13:04 -0800)]
Update/cleanup Bluetooth Codec strings in Developer Settings
Misc. fixes and cleanup related to the Bluetooth Codec strings
in Developer Settings:
* Update the codec name "aptX-HD" -> "aptX HD" to reflect the vendor
defined writing:
https://www.aptx.com/aptx-hd
* Increase some of the "CHAR LIMIT" values for the purpose
of translation to other languages
* Update some of the text in the UI (for clarity)
* Added new string: "Streaming: " that is used in the UI summary
Test: UI visual observation
Bug: b/
34188102 b/
34206536 b/
34209576 b/
34210861 b/
34207126 b/
34211204
Bug: b/
34206992 b/
34210910 b/
34210162 b/
34205434 b/
34198432 b/
34186749
Bug: b/
34188141 b/
34188657 b/
34192932 b/
34188655
Change-Id: I9dc609594864b5d29394c49e0bce64416706c81c
Glen Kuhne [Wed, 18 Jan 2017 18:57:40 +0000 (18:57 +0000)]
Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4 am:
d2f5fd3c42
am:
878fcfaa22
Change-Id: Ib4a59d41088ba00b21ccaeea6a9e7578c24ab8da
Bartosz Fabianowski [Fri, 13 Jan 2017 15:46:47 +0000 (16:46 +0100)]
Ensure correct install reason
When installing a package, we trust the installer to set the install
reason correctly. However, there are cases where we know what the
install reason should be (e.g. install by Device Owner or Profile Owner
should always be recorded as caused by enterprise policy) or we do not
trust the installer (e.g. an ordinary app not acting on behalf of an
enterprise should not be allowed to set the install reason to enterprise
policy).
This CL introduces a fix-up method that enforces these rules.
Bug:
32692748
Test: Manually tested all scenarios; DO case also covered by CTS
Change-Id: I18eb891401c9e38546f823a14f67391c94b22e28
Kenny Guy [Wed, 18 Jan 2017 18:55:17 +0000 (18:55 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864
am:
c8a6eb1382
Change-Id: I8c6af06495a4a4b4687c235c904e2a2d7d1480bc
Tucker Sylvestro [Wed, 18 Jan 2017 18:54:12 +0000 (18:54 +0000)]
svc nfc should support watches too am:
1876583bfb
am:
baa26e2d3d
Change-Id: I14f715f5b6937e7f2c5fb55a69fbeb750e31186b
Rebecca Silberstein [Wed, 18 Jan 2017 18:53:55 +0000 (18:53 +0000)]
Merge "SystemServer: reorder wifi services start"
Jay [Wed, 18 Jan 2017 18:53:20 +0000 (18:53 +0000)]
Merge "Notify user switch event to NetworkController" am:
1aa24246cf am:
4ab0e9f824
am:
3f326e7011
Change-Id: I9a844a8bf1fb7bc3cfabc0832e7fb532278cda99
Jason Monk [Wed, 18 Jan 2017 18:52:14 +0000 (18:52 +0000)]
Fix build
am:
005055c070
Change-Id: Ica900e6a6e7413408ac5d79dedfcf41526011be0
Jason Monk [Wed, 18 Jan 2017 18:45:59 +0000 (13:45 -0500)]
resolve merge conflicts of
54bce9c6ff1f to nyc-mr2-dev-plus-aosp
Change-Id: Ifaea1d0f58ea81a7d929dc891fe69c8d7c15af4e
TreeHugger Robot [Wed, 18 Jan 2017 18:27:06 +0000 (18:27 +0000)]
Merge "Execute non-optimized add operations one at a time."
Glen Kuhne [Wed, 18 Jan 2017 18:25:52 +0000 (18:25 +0000)]
Merge "Unhide WifiConfiguration proxy accessors" am:
c82d1ddaf4
am:
d2f5fd3c42
Change-Id: I20fbec10c7a3355d80a305583308095954ff5488
Glen Kuhne [Wed, 18 Jan 2017 18:20:43 +0000 (18:20 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"
am:
c82d1ddaf4
Change-Id: I12e44cf9c75f76712eb2c89fbd878a7cb74ec8a9
TreeHugger Robot [Wed, 18 Jan 2017 18:19:28 +0000 (18:19 +0000)]
Merge "System API for a proxy for registered players"
Selim Cinek [Wed, 18 Jan 2017 18:11:10 +0000 (18:11 +0000)]
Merge "Fixed a crash when showing guts"
Michael Wright [Wed, 18 Jan 2017 18:09:29 +0000 (18:09 +0000)]
Validate custom pointer icons aren't null.
Bug:
33853287
Test: cts
Change-Id: I844a9aec6e37e306a77eee0644a774f6470cf5df
Glen Kuhne [Wed, 18 Jan 2017 18:08:35 +0000 (18:08 +0000)]
Merge "Unhide WifiConfiguration proxy accessors"
Tamas Berghammer [Wed, 18 Jan 2017 18:06:43 +0000 (18:06 +0000)]
Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
am:
3db5d42f90
Change-Id: Ia944e535f7329c32bf34770fb0d99019cc1091f9
Kenny Guy [Wed, 18 Jan 2017 18:02:38 +0000 (18:02 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864 am:
748e78bd2c
am:
7f00eb6e90
Change-Id: Ib248081f9ff9a836b1daa93502b8895126ea7d89
Android Build Merger (Role) [Wed, 18 Jan 2017 18:01:56 +0000 (18:01 +0000)]
Merge "Update package names to work with the proto3 compiler am:
cbd3f0c59a -s ours" into nyc-mr2-dev-plus-aosp
TreeHugger Robot [Wed, 18 Jan 2017 17:57:59 +0000 (17:57 +0000)]
Merge "Fix test DevicePolicyManagerTest#testSetRequiredStrongAuthTimeout_DeviceOwner"
Kenny Guy [Wed, 18 Jan 2017 17:55:04 +0000 (17:55 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed am:
1894632864
am:
748e78bd2c
Change-Id: I6d8c1b6e6f6b171527fa48bf477926a31aa5aacf
Kenny Guy [Wed, 18 Jan 2017 17:47:03 +0000 (17:47 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed
am:
1894632864
Change-Id: I10ed70e5aef941dd7b31f381f78eb8418985f33c
Kenny Guy [Wed, 18 Jan 2017 17:47:02 +0000 (17:47 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed
am:
1894632864
Change-Id: I4328578f929875fd59f48681b8ae2c7c4d3bd623
Tamas Berghammer [Wed, 18 Jan 2017 17:44:23 +0000 (17:44 +0000)]
Update package names to work with the proto3 compiler
am:
cbd3f0c59a -s ours
Change-Id: I8c957a9ad00cb393dbaaa05bec9730cc3a84a94e
Kenny Guy [Wed, 18 Jan 2017 17:33:33 +0000 (17:33 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af
am:
ee9f03d1ed
Change-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05
Kenny Guy [Wed, 18 Jan 2017 17:27:10 +0000 (17:27 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a
am:
b275a205af
Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
Bartosz Fabianowski [Wed, 18 Jan 2017 17:25:45 +0000 (17:25 +0000)]
Merge "Allow system to retrieve permission grant state"
Bartosz Fabianowski [Mon, 16 Jan 2017 10:47:28 +0000 (11:47 +0100)]
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
Brian Duddie [Wed, 18 Jan 2017 17:16:02 +0000 (17:16 +0000)]
Merge "ContextHubService: Pass nanoapp header data explicitly"
Kenny Guy [Wed, 18 Jan 2017 17:13:31 +0000 (17:13 +0000)]
Fix issue with saving admins before finishing loading.
am:
f98ed6863a
Change-Id: I7f816c164548df86f9607c86772902efd0d53620
Makoto Onuki [Wed, 18 Jan 2017 17:04:23 +0000 (17:04 +0000)]
Merge "Add ProviderStatus.DATABASE_CREATION_TIMESTAMP"
Roozbeh Pournader [Wed, 18 Jan 2017 17:03:32 +0000 (17:03 +0000)]
Merge "Update locale data from in-tree ICU"
Tucker Sylvestro [Wed, 18 Jan 2017 16:47:59 +0000 (16:47 +0000)]
svc nfc should support watches too am:
1876583bfb am:
eed0a7bf45
am:
93591413eb
Change-Id: I5324063d869d8387b4964279b461cdd232011887
Tucker Sylvestro [Wed, 18 Jan 2017 16:41:54 +0000 (16:41 +0000)]
svc nfc should support watches too am:
1876583bfb
am:
eed0a7bf45
Change-Id: If7f2515750bb74d0c9f3baae9fe0a1fc3eeb36ef
Tucker Sylvestro [Wed, 18 Jan 2017 16:34:58 +0000 (16:34 +0000)]
svc nfc should support watches too
am:
1876583bfb
Change-Id: I9612fbe232ecf883fda2c629438ed55ddb50c468
Tucker Sylvestro [Wed, 18 Jan 2017 16:34:50 +0000 (16:34 +0000)]
svc nfc should support watches too
am:
1876583bfb
Change-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297
Michal Karpinski [Wed, 18 Jan 2017 15:54:18 +0000 (15:54 +0000)]
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
Greg Daniel [Wed, 18 Jan 2017 16:13:00 +0000 (16:13 +0000)]
Merge "Update hwui_unit_tests to support running with Vulkan backend."
Jay [Wed, 18 Jan 2017 15:49:58 +0000 (15:49 +0000)]
Merge "Notify user switch event to NetworkController" am:
1aa24246cf
am:
4ab0e9f824
Change-Id: I51365e12797493e620e3146cc7e25eda8c2065c8
Jay [Wed, 18 Jan 2017 15:43:51 +0000 (15:43 +0000)]
Merge "Notify user switch event to NetworkController"
am:
1aa24246cf
Change-Id: I1c2cefbc0fff7d90a4c2a0314c3697ee198caab5
Treehugger Robot [Wed, 18 Jan 2017 15:32:27 +0000 (15:32 +0000)]
Merge "Notify user switch event to NetworkController"
Tucker Sylvestro [Wed, 14 Dec 2016 19:01:14 +0000 (14:01 -0500)]
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
TreeHugger Robot [Wed, 18 Jan 2017 15:19:39 +0000 (15:19 +0000)]
Merge "Handle multiprocess flag in WebView update service."
Jason Monk [Wed, 18 Jan 2017 15:04:51 +0000 (10:04 -0500)]
Fix build
Test: treehugger
Change-Id: Ic33d5ff2d7845bf4edd81d3e966fce3f0e5956bb
TreeHugger Robot [Wed, 18 Jan 2017 14:56:45 +0000 (14:56 +0000)]
Merge "Don't play notification audio in vibrate mode"
Jason Monk [Wed, 18 Jan 2017 14:24:48 +0000 (14:24 +0000)]
Merge "SystemUI: Add NFC tile" am:
943a52862e
am:
8fbdf116d0
Change-Id: I114a75548444e409d1f72183589c886ca9fbccbd
Jason Monk [Wed, 18 Jan 2017 14:19:48 +0000 (14:19 +0000)]
Merge "SystemUI: Add NFC tile"
am:
943a52862e
Change-Id: Icf68f41a0b930da0b846a9b71da1121ef4987d56
Greg Daniel [Wed, 4 Jan 2017 19:45:56 +0000 (14:45 -0500)]
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
Jason Monk [Wed, 18 Jan 2017 14:07:52 +0000 (14:07 +0000)]
Merge "SystemUI: Add NFC tile"
OSDN Git Service
