OSDN Git Service
Donghyun Cho [Fri, 23 Dec 2016 05:41:00 +0000 (14:41 +0900)]
CEC: Use isConnected() to check ARC transmission feasibility
Whenever every hotplug event occurs, ARC feature has been
disabled/enabled if needed in order not to establish ARC connection if
+5V status is false. The check, whether feature should be
disabled/enabled or not, is based on the device info of AVR. But it may
malfunction if the device info is stale because of rapid and repeated
plug in/out. This change simplifies this check by using isConnected()
instead of disabling/enabling full ARC feature.
Bug:
33567002
Test: Applied this change and plug in/out rapidly on archer.
Change-Id: I420270193d2f60f61f3c39a151c7e06d326651d2
(cherry picked from commit
b0fd6a1bed5d522673233fbd51d1d7508c790c0c)
Nick Kralevich [Sun, 8 Jan 2017 15:28:02 +0000 (15:28 +0000)]
Merge "Dumps total size of primary storage." am:
55dc66dde4 am:
12b387dd87 am:
a63462c794
am:
4429993d78 -s ours
Change-Id: I541b8ec5085dd0a1a78337f57d155aa0ff0d3b68
Nick Kralevich [Sun, 8 Jan 2017 15:09:21 +0000 (15:09 +0000)]
Merge "Dumps total size of primary storage." am:
55dc66dde4 am:
12b387dd87
am:
a63462c794
Change-Id: I2a62442a581d89054421dd6c44c610fb7ee9a0c4
Nick Kralevich [Sun, 8 Jan 2017 15:04:54 +0000 (15:04 +0000)]
Merge "Dumps total size of primary storage." am:
55dc66dde4
am:
12b387dd87
Change-Id: I08e98467d212a7f9ec01b16a46540bc3d059ee51
Nick Kralevich [Sun, 8 Jan 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Dumps total size of primary storage."
am:
55dc66dde4
Change-Id: Ifc3537d3aeda5e6eb3b1c003a4eaf392d07bcf86
Nick Kralevich [Sun, 8 Jan 2017 14:53:08 +0000 (14:53 +0000)]
Merge "Dumps total size of primary storage."
Peter Qiu [Sun, 8 Jan 2017 10:05:27 +0000 (10:05 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update" am:
b1c9bc5ea5 am:
fdbc827a52 am:
5549acb0e6
am:
fc9579cfda
Change-Id: I5d9166a297b1fdb16d14fcd7eb83866e1be5606a
Peter Qiu [Sun, 8 Jan 2017 07:14:30 +0000 (07:14 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update" am:
b1c9bc5ea5 am:
fdbc827a52
am:
5549acb0e6
Change-Id: I202a51c7d32ecf747fcc32597ac574b5faac2037
Peter Qiu [Sun, 8 Jan 2017 07:06:20 +0000 (07:06 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update" am:
b1c9bc5ea5
am:
fdbc827a52
Change-Id: Ifaf73023a932b2866ed3da1d81abeed920e8427b
Peter Qiu [Sun, 8 Jan 2017 07:00:57 +0000 (07:00 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update"
am:
b1c9bc5ea5
Change-Id: I47d8e12fbb7bc3faefabbed02b7235396eb6dbe5
Treehugger Robot [Sun, 8 Jan 2017 06:51:51 +0000 (06:51 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update"
Felipe Leme [Tue, 11 Oct 2016 00:12:20 +0000 (17:12 -0700)]
Dumps total size of primary storage.
BUG:
32069168
Test: manual verification
(cherry picked from commit
281389ac5475e483d10a2e8aa31195b9e9875246)
Change-Id: If5dee52a99c03a00dada22736c09d953dc0b66d1
Etan Cohen [Sat, 7 Jan 2017 20:34:49 +0000 (20:34 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback" am:
bbbe5e6ccd am:
dce01e235b am:
baf9bb8563
am:
8bad14363e
Change-Id: I545524b640fc1fbef547b0006fa6288bc45be7c1
Etan Cohen [Sat, 7 Jan 2017 20:26:19 +0000 (20:26 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback" am:
bbbe5e6ccd am:
dce01e235b
am:
baf9bb8563
Change-Id: I96c804fe006cfefb0b635f88a0f8d0e185576c3b
Etan Cohen [Sat, 7 Jan 2017 20:18:23 +0000 (20:18 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback" am:
bbbe5e6ccd
am:
dce01e235b
Change-Id: I0e693ff19f8c08212c4daadebc3b6af33e239eda
Etan Cohen [Sat, 7 Jan 2017 20:13:33 +0000 (20:13 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback"
am:
bbbe5e6ccd
Change-Id: Iede092421659c5ae55475f153d940d97dac6b7b0
Etan Cohen [Sat, 7 Jan 2017 20:05:37 +0000 (20:05 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback"
Tomasz Wasilczyk [Sat, 7 Jan 2017 20:03:40 +0000 (20:03 +0000)]
Merge "Make metadata field mandatory for program info struct."
Etan Cohen [Sat, 7 Jan 2017 18:48:10 +0000 (18:48 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am:
834a87d525 am:
fd23421472 am:
0bad91b5ac
am:
0232d18805
Change-Id: Ibdb559206159eb840810f55f51545cdc797d16d6
Etan Cohen [Sat, 7 Jan 2017 18:38:08 +0000 (18:38 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am:
834a87d525 am:
fd23421472
am:
0bad91b5ac
Change-Id: I10da8332166d94c543ea94519af702961d3a429c
Etan Cohen [Sat, 7 Jan 2017 18:29:13 +0000 (18:29 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am:
834a87d525
am:
fd23421472
Change-Id: I6ba8709fcce9e68b85811959400c5240e2a2bb36
Etan Cohen [Sat, 7 Jan 2017 18:20:31 +0000 (18:20 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace"
am:
834a87d525
Change-Id: I243194a658ee8e9c5a21301601a473149eaa8a2f
Etan Cohen [Sat, 7 Jan 2017 18:12:33 +0000 (18:12 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace"
Jeff Sharkey [Sat, 7 Jan 2017 16:18:35 +0000 (16:18 +0000)]
Merge "Initial API shape for storage statistics."
TreeHugger Robot [Sat, 7 Jan 2017 06:02:27 +0000 (06:02 +0000)]
Merge "Moved implicit intents into explicit intents"
Jack Yu [Thu, 5 Jan 2017 23:19:31 +0000 (15:19 -0800)]
Moved implicit intents into explicit intents
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.
The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver
bug:
33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
David Friedman [Sat, 7 Jan 2017 03:11:43 +0000 (03:11 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda am:
a303af44f9" into nyc-mr2-dev-plus-aosp
am:
cea9b99099
Change-Id: I8a6e872a2d6419e1bb343eb3aeb3967d82d73031
David Friedman [Sat, 7 Jan 2017 03:11:35 +0000 (03:11 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda am:
a303af44f9
am:
7583234ece
Change-Id: I7bf139f6cadf547259122ef4505c64f477b27420
David Friedman [Sat, 7 Jan 2017 03:10:06 +0000 (03:10 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda am:
b6092f5aed" into nyc-mr2-dev-plus-aosp
am:
b5aaead225
Change-Id: Ia9b3c5d768ff09d2723abe3b98d8a4bcdc2f2a40
David Friedman [Sat, 7 Jan 2017 03:09:56 +0000 (03:09 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda am:
b6092f5aed
am:
fa57c1c713
Change-Id: If3934a12c75bd88850aa87b068fb430df8d7815d
Dave Friedman [Sat, 7 Jan 2017 03:08:20 +0000 (03:08 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579 am:
89f96e8fa4" into nyc-mr2-dev-plus-aosp
am:
b07a52ee91
Change-Id: I6f89296178074412c3827da700d24c67ada5641e
Dave Friedman [Sat, 7 Jan 2017 03:08:12 +0000 (03:08 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579 am:
89f96e8fa4
am:
696f17fff2
Change-Id: I072533052cf5ce78f89defb889fd0e1b11710399
Dave Friedman [Sat, 7 Jan 2017 03:06:54 +0000 (03:06 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579 am:
fb8676e50c
am:
5346355f4d
Change-Id: I67559350187089b64f0ce092c1f6ae8e7a52542e
Android Build Merger (Role) [Sat, 7 Jan 2017 03:00:18 +0000 (03:00 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda am:
a303af44f9" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Sat, 7 Jan 2017 02:59:53 +0000 (02:59 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda am:
b6092f5aed" into nyc-mr2-dev-plus-aosp
David Friedman [Sat, 7 Jan 2017 02:59:33 +0000 (02:59 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda
am:
a303af44f9
Change-Id: I8a5a979b7a037f4c010e25393f2fe7a74a4fee5f
David Friedman [Sat, 7 Jan 2017 02:59:13 +0000 (02:59 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca am:
d8e95f6bda
am:
b6092f5aed
Change-Id: I388b5c7e19a4ca6333be82136c33df3a2731b3f0
Android Build Merger (Role) [Sat, 7 Jan 2017 02:59:06 +0000 (02:59 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579 am:
89f96e8fa4" into nyc-mr2-dev-plus-aosp
Dave Friedman [Sat, 7 Jan 2017 02:58:22 +0000 (02:58 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579
am:
89f96e8fa4
Change-Id: Iba9639fe928c6201a574dc1b9cdfb5247ab72439
Dave Friedman [Sat, 7 Jan 2017 02:58:15 +0000 (02:58 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0 am:
eedb695579
am:
fb8676e50c
Change-Id: I5b13dcbab3aed19c805473a6ab91eef197ded51d
David Friedman [Sat, 7 Jan 2017 02:51:16 +0000 (02:51 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca
am:
d8e95f6bda
Change-Id: I1638d0b407db1a990b0c32f3cb14344f524ba8a4
David Friedman [Sat, 7 Jan 2017 02:51:15 +0000 (02:51 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266 am:
bcc449eeca
am:
d8e95f6bda
Change-Id: I566c5345fee98650766f31af2c5723d8b423fbd5
Dave Friedman [Sat, 7 Jan 2017 02:50:18 +0000 (02:50 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0
am:
eedb695579
Change-Id: Ia5922ed50290cc8f47d07f1516bc5a21b0bec270
Dave Friedman [Sat, 7 Jan 2017 02:50:17 +0000 (02:50 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b am:
a111e0f7f0
am:
eedb695579
Change-Id: Icd2ded633cf7211ef9d1a2106216450db7773408
TreeHugger Robot [Sat, 7 Jan 2017 02:49:08 +0000 (02:49 +0000)]
Merge "Make REQUEST_NETWORK_SCORES signature only."
TreeHugger Robot [Sat, 7 Jan 2017 02:48:41 +0000 (02:48 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
David Friedman [Sat, 7 Jan 2017 02:46:33 +0000 (02:46 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826 am:
c3b564e266
am:
bcc449eeca
Change-Id: I070f5c7088ce237995f995c2aa097e1f04cc4000
Dave Friedman [Sat, 7 Jan 2017 02:43:44 +0000 (02:43 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe am:
e0fd4c8a3b
am:
a111e0f7f0
Change-Id: Ic5d7e0ce01bd573e0882122d0709cbc2da56f448
Dmitry Dementyev [Sat, 7 Jan 2017 02:41:41 +0000 (02:41 +0000)]
Merge "Implement Account Discovery API."
David Friedman [Sat, 7 Jan 2017 02:39:33 +0000 (02:39 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev am:
101f885826
am:
c3b564e266
Change-Id: I23fdc92b08e32c643de8009bebf4e02c41741c7e
Dave Friedman [Sat, 7 Jan 2017 02:38:45 +0000 (02:38 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540 am:
2a3ebadcbe
am:
e0fd4c8a3b
Change-Id: I8f65ad71433efbe1121e0617c6d7575b7db3a051
David Friedman [Sat, 7 Jan 2017 02:30:48 +0000 (02:30 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev
am:
101f885826
Change-Id: I5e6d948373c8f8ff2892c843329a7d2b540b8706
Dave Friedman [Sat, 7 Jan 2017 02:30:45 +0000 (02:30 +0000)]
Docs: Updates Javadoc documentation. Bug:
32532540
am:
2a3ebadcbe
Change-Id: Ibee55c5e73d9b51e5f5df24be01b0b797fa8a7a5
David Friedman [Sat, 7 Jan 2017 02:24:54 +0000 (02:24 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug:
32532540" into nyc-dev
TreeHugger Robot [Sat, 7 Jan 2017 02:20:14 +0000 (02:20 +0000)]
Merge "libandroidfw: Revert null check in ApplyStyle"
Alex Naidis [Sat, 7 Jan 2017 01:52:33 +0000 (01:52 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am:
0b325c6634 am:
fd55f834c8 am:
80888cdcbe
am:
2603aab95c
Change-Id: Iaca178d58a657ed59e3b9cbc08c3d2909cbf0811
Adam Lesinski [Sat, 7 Jan 2017 01:51:03 +0000 (01:51 +0000)]
Merge changes from topic 'learned_capacity'
* changes:
BatteryStats: Report learned battery capacity as event
Parcel/unparcel charge_full state from BatteryProperties
Alex Naidis [Sat, 7 Jan 2017 01:48:19 +0000 (01:48 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am:
0b325c6634 am:
fd55f834c8
am:
80888cdcbe
Change-Id: I9852107278f6206582393a57be60074763a6cb81
Alex Naidis [Sat, 7 Jan 2017 01:44:14 +0000 (01:44 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am:
0b325c6634
am:
fd55f834c8
Change-Id: Ia53faad0ba004233d0ee031e1ca83d705f5bd379
Pavlin Radoslavov [Sat, 7 Jan 2017 01:40:55 +0000 (01:40 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options" am:
bfd7f9a1f8 am:
d190040dd1 am:
8905569c67
am:
afdf387e13
Change-Id: I493e5f8f639a0c7e0dccabed00b48e9216b3cc34
Alex Naidis [Sat, 7 Jan 2017 01:40:42 +0000 (01:40 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
am:
0b325c6634
Change-Id: I5d217037bececb7a096ccfa018fafaa4280e4537
Pavlin Radoslavov [Sat, 7 Jan 2017 01:36:47 +0000 (01:36 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options" am:
bfd7f9a1f8 am:
d190040dd1
am:
8905569c67
Change-Id: I74b2606347e9b6e2a2424add4aa74d0db687f6ee
Stefan Kuhne [Sat, 7 Jan 2017 01:34:59 +0000 (01:34 +0000)]
Merge "Apps which do not support density cannot be resized"
Treehugger Robot [Sat, 7 Jan 2017 01:33:18 +0000 (01:33 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
Pavlin Radoslavov [Sat, 7 Jan 2017 01:29:44 +0000 (01:29 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options" am:
bfd7f9a1f8
am:
d190040dd1
Change-Id: I051932a98729e91f4e6512c9fa84a7e261b8cd96
Pavlin Radoslavov [Sat, 7 Jan 2017 01:25:34 +0000 (01:25 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
am:
bfd7f9a1f8
Change-Id: I0cc5f64f292a56e6301b294974c1bd3cc72664c0
Treehugger Robot [Sat, 7 Jan 2017 01:19:33 +0000 (01:19 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
Adam Lesinski [Fri, 6 Jan 2017 01:03:55 +0000 (17:03 -0800)]
libandroidfw: Revert null check in ApplyStyle
The out parameter `out_indices` is expected to be non-null
and so the extra null check adds a cost to performance
and opens the door to misusing the API by not supplying
`out_indices`.
Test: make libandroidfw_tests
Change-Id: Ie66fd837c5e24ec2838156e7b67f54c15cd27933
Dmitry Dementyev [Wed, 21 Dec 2016 02:08:51 +0000 (18:08 -0800)]
Implement Account Discovery API.
Bug: https://b.corp.google.com/issues/
33046496
Test: cts tests, manual tests.
Change-Id: I03d1ae5dfa1577f191817aa7d508f6b4d0e625ed
Dave Friedman [Thu, 5 Jan 2017 02:27:26 +0000 (18:27 -0800)]
Docs: Updates Javadoc documentation.
Bug:
32532540
Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
Andrii Kulian [Sat, 7 Jan 2017 00:16:45 +0000 (00:16 +0000)]
Merge "Fix selecting focused stack with secondary displays"
Etan Cohen [Sat, 24 Dec 2016 20:44:59 +0000 (12:44 -0800)]
[AWARE] Remove reason from discovery session terminate callback
Only valid reason is per request (destroy or timeout/count).
Bug:
32670068
Test: unit tests & integration tests (sl4a) passing
Change-Id: I85d417442e26a16d7f09d6d2d4cbb8ae7a9eba7e
Etan Cohen [Mon, 19 Dec 2016 23:54:51 +0000 (15:54 -0800)]
[AWARE] Simplify Wi-Fi Aware API namespace
Simplify Wi-fi Aware API namespace. Rely on project and remove WifiAware
prefix from most classes.
(pure rename operation: no functional changes)
Bug:
31470256
Test: unit-tests + integration (sl4a) tests.
Change-Id: I38b8137c1730c8f40c482c6770caafcaeafd5c46
Pavlin Radoslavov [Thu, 5 Jan 2017 18:46:08 +0000 (10:46 -0800)]
Add Bluetooth Codec selection UI to the Developer Options
Test: A2DP streaming to headsets and manual UI interaction
Bug:
30958229
Change-Id: I88f6efedf1c89b524c863543135ef7be9b7e1a7c
Jeremy Joslin [Fri, 6 Jan 2017 22:36:54 +0000 (14:36 -0800)]
Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33752149
Change-Id: I7d91fa9a4f6ef4f9170c6af98567ce443c805e74
Ruchi Kandoi [Fri, 6 Jan 2017 22:42:28 +0000 (22:42 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev am:
cb4f643b95
am:
f30c2860d1
Change-Id: Ie1eeb05332e670875704602c1a79ce17972a2e69
Ruchi Kandoi [Fri, 6 Jan 2017 22:41:15 +0000 (22:41 +0000)]
nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings. am:
3a1ff62e5a
am:
8673349cc3
Change-Id: Ib860bb7431e679b5ba22b5c825e7f5ac34405780
Jeremy Joslin [Fri, 6 Jan 2017 22:38:57 +0000 (14:38 -0800)]
Make REQUEST_NETWORK_SCORES signature only.
There are no use cases where it's needed by a privileged app today.
Test: Built and ran
BUG:
33752149
Change-Id: Iae689e878fdb60b506536c918079a4fcff527a71
Ruchi Kandoi [Fri, 6 Jan 2017 22:24:54 +0000 (22:24 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev
am:
cb4f643b95
Change-Id: I36d7312e2e9c6a121b3297c298d4e32867c7d84a
Ruchi Kandoi [Fri, 6 Jan 2017 22:24:46 +0000 (22:24 +0000)]
nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
am:
3a1ff62e5a
Change-Id: I1fbc203c2becededcbc8e9d873ff89244c52b7ba
Alex Naidis [Tue, 3 Jan 2017 17:24:57 +0000 (18:24 +0100)]
DefaultPermissionGrantPolicy: Pass correct arguments
After parsing the xml files in the "default-permissions"
system, we are passing the arguments in the wrong order.
The method we are targeting is:
private void grantRuntimePermissionsLPw(PackageParser.Package pkg, Set<String> permissions,
boolean systemFixed, boolean isDefaultPhoneOrSms, int userId) {
However we are passing our argument for "systemFixed"
to "isDefaultPhoneOrSms" and the other way around too.
This patch fixes it by using the version of the method
which takes 4 arguments and sets "isDefaultPhoneOrSms"
as false.
Change-Id: I3604a5d6045aadcd91b6dd3f6f1b47b561403b23
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Tomasz Wasilczyk [Fri, 6 Jan 2017 22:18:34 +0000 (14:18 -0800)]
Make metadata field mandatory for program info struct.
Test: VTS, manual
Change-Id: I2630e246eba3980ae6517d92cab3a9fc55d8d7b4
TreeHugger Robot [Fri, 6 Jan 2017 22:18:22 +0000 (22:18 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev
Peter Qiu [Thu, 15 Dec 2016 23:38:56 +0000 (15:38 -0800)]
wifi: hotspot2: Passpoint configuration APIs update
- renamed addPasspointConfiguration to addOrUpdatePasspointConfiguration
to match the implementation of the API
- updated getPasspointConfigurations to return an empty list instead of
a null when no configuration is installled
Bug:
33587910
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Id40185edb08910c01454c44b77957e2d5c0df722
Fyodor Kupolov [Fri, 6 Jan 2017 21:45:09 +0000 (21:45 +0000)]
Merge "Always use multi-dex for FrameworksServiceTests"
Fyodor Kupolov [Fri, 6 Jan 2017 21:36:40 +0000 (13:36 -0800)]
Always use multi-dex for FrameworksServiceTests
Otherwise it exceeds ids limit:
ERROR: Dex writing phase: classes.dex has too many IDs. Try using multi-dex
Test: manual - device builds, tests are running
Change-Id: I042cd1b8cb8d41c8db055ba8c6ceb56eb592c30f
Makoto Onuki [Fri, 6 Jan 2017 21:32:31 +0000 (21:32 +0000)]
Merge "Revert "ShortcutManager: Floating shortcuts shouldn't have target activities.""
TreeHugger Robot [Fri, 6 Jan 2017 21:27:49 +0000 (21:27 +0000)]
Merge "Move category refresh call into a separeate method."
Ruben Brunk [Fri, 6 Jan 2017 21:23:47 +0000 (21:23 +0000)]
Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev am:
0d8c4765b2
am:
d6d006c087
Change-Id: I74bfe5a3cabb844839e136fc4b9fc6e83610fba1
Ruben Brunk [Fri, 6 Jan 2017 21:22:57 +0000 (21:22 +0000)]
Fix unexpected VR mode exit on package update. am:
1ad4a2d32e
am:
4e61a045e1
Change-Id: Ib5b02c1d27da030cf9f8e75328507b791d934cef
Dan Albert [Fri, 6 Jan 2017 21:15:56 +0000 (21:15 +0000)]
Merge "Unversion NDK stub libraries." am:
ddc7ac8ba6 am:
e2b4d4a38a am:
22f0b9d1ae
am:
cf49a04ce6
Change-Id: Ia47164a731eea1bc93e9a1259b0d13127ec388cb
Ruben Brunk [Fri, 6 Jan 2017 21:14:31 +0000 (21:14 +0000)]
Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev
am:
0d8c4765b2
Change-Id: I709b8c9f3d6d32f3f71c2848716563a6b598d503
Ruben Brunk [Fri, 6 Jan 2017 21:14:27 +0000 (21:14 +0000)]
Fix unexpected VR mode exit on package update.
am:
1ad4a2d32e
Change-Id: Ic0c025d3f360197dc41fe2b999b5d20763285cd5
Dan Albert [Fri, 6 Jan 2017 21:10:51 +0000 (21:10 +0000)]
Merge "Unversion NDK stub libraries." am:
ddc7ac8ba6 am:
e2b4d4a38a
am:
22f0b9d1ae
Change-Id: Ie6abad6c56a55cd67c22903cd9d60bd907d45e9b
TreeHugger Robot [Fri, 6 Jan 2017 21:07:26 +0000 (21:07 +0000)]
Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev
Andrew Sapperstein [Fri, 6 Jan 2017 21:04:16 +0000 (21:04 +0000)]
Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev am:
e553cebbeb
am:
ad11ecfbbc
Change-Id: Id1c49226eb459eacff6cc5a23b18a62cd3302960
Andrew Sapperstein [Fri, 6 Jan 2017 21:03:26 +0000 (21:03 +0000)]
Update CHAR LIMIT for notification body. am:
429cafb85e
am:
ddb2539508
Change-Id: I0aa9498f9669db6d55e5bacf5f23ae5b01ca3229
Dan Albert [Fri, 6 Jan 2017 21:03:24 +0000 (21:03 +0000)]
Merge "Unversion NDK stub libraries." am:
ddc7ac8ba6
am:
e2b4d4a38a
Change-Id: I57440577773e47f60e6af4e9112523b78741f9fa
TreeHugger Robot [Fri, 6 Jan 2017 21:00:17 +0000 (21:00 +0000)]
Merge "Make sure cleanup is always done when task is removed"
Andrew Sapperstein [Fri, 6 Jan 2017 20:57:12 +0000 (20:57 +0000)]
Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev
am:
e553cebbeb
Change-Id: I390db320ba7139dcc96f361ce4f850b8125482b9
OSDN Git Service
