OSDN Git Service
Peter Qiu [Thu, 26 Jan 2017 23:11:17 +0000 (23:11 +0000)]
Merge changes If5025361,Iabe27cd8 am:
0a649bffcc am:
0773d2cc0d
am:
26bdc1f273
Change-Id: I9576f50cc7a922a684efb9ab4e1a57eac766280f
Peter Qiu [Thu, 26 Jan 2017 23:09:59 +0000 (23:09 +0000)]
hotspot2: added remaining parameters to PasspointConfiguration am:
ddf6fa06c6 am:
44bcb75926
am:
8badc8566a
Change-Id: I700aa39aed04e002643371b552647ada2492c6bf
Peter Qiu [Thu, 26 Jan 2017 23:09:07 +0000 (23:09 +0000)]
hotspot2: add support for complete PerProviderSubscription/Policy subtree am:
2d7af45e93 am:
01e738a040
am:
6251e52cc0
Change-Id: I1305266ff24105e5b9326868f3212f8a27802fea
Peter Qiu [Thu, 26 Jan 2017 23:03:03 +0000 (23:03 +0000)]
Merge changes If5025361,Iabe27cd8 am:
0a649bffcc
am:
0773d2cc0d
Change-Id: Ie890d96d2e2741cefc2e20957a65a0cd65c2fe13
Peter Qiu [Thu, 26 Jan 2017 23:01:35 +0000 (23:01 +0000)]
hotspot2: added remaining parameters to PasspointConfiguration am:
ddf6fa06c6
am:
44bcb75926
Change-Id: Ibb587721014dd25243f7423864f1d5019ee42fde
Peter Qiu [Thu, 26 Jan 2017 23:00:38 +0000 (23:00 +0000)]
hotspot2: add support for complete PerProviderSubscription/Policy subtree am:
2d7af45e93
am:
01e738a040
Change-Id: Ic35247930e4c7a99c5408593287926adcc1be8b9
Peter Qiu [Thu, 26 Jan 2017 22:53:13 +0000 (22:53 +0000)]
Merge changes If5025361,Iabe27cd8
am:
0a649bffcc
Change-Id: Ia66d523ed565704178315d66bd19ffe02cbb7560
Peter Qiu [Thu, 26 Jan 2017 22:53:04 +0000 (22:53 +0000)]
hotspot2: added remaining parameters to PasspointConfiguration
am:
ddf6fa06c6
Change-Id: I023acc0ae2920391de8a8de8ee95152f510ca9bd
Peter Qiu [Thu, 26 Jan 2017 22:52:11 +0000 (22:52 +0000)]
hotspot2: add support for complete PerProviderSubscription/Policy subtree
am:
2d7af45e93
Change-Id: Icf253102520e81766e726d9247c9614b6c0ebacd
Treehugger Robot [Thu, 26 Jan 2017 22:41:17 +0000 (22:41 +0000)]
Merge changes If5025361,Iabe27cd8
* changes:
hotspot2: added remaining parameters to PasspointConfiguration
hotspot2: add support for complete PerProviderSubscription/Policy subtree
Winson Chung [Thu, 26 Jan 2017 22:23:18 +0000 (22:23 +0000)]
Merge "DO NOT MERGE Fixing crash in SystemUI fetching task description icons." into nyc-mr2-dev
am:
c52a3cb704
Change-Id: If0c3bb685dfd6a13d816c8ef01a291e3988cf5a5
Winson Chung [Thu, 26 Jan 2017 22:23:11 +0000 (22:23 +0000)]
DO NOT MERGE Fixing crash in SystemUI fetching task description icons.
am:
452ff6db94
Change-Id: Ibbc3312c882c2c5cfd250b2a7062e365a0fde5a7
Winson Chung [Thu, 26 Jan 2017 22:17:08 +0000 (22:17 +0000)]
Merge "DO NOT MERGE Fixing crash in SystemUI fetching task description icons." into nyc-mr2-dev
Peter Qiu [Thu, 26 Jan 2017 20:35:03 +0000 (20:35 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2" am:
8150581742 am:
358fe50e4d
am:
afc65709ee
Change-Id: If5b97a53b453c6ee347ce4667b3bcba4ee24dd9e
Peter Qiu [Thu, 26 Jan 2017 20:31:19 +0000 (20:31 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2" am:
8150581742
am:
358fe50e4d
Change-Id: Idc004300acfc3db7036ea31466fe392454fd144c
Peter Qiu [Thu, 26 Jan 2017 20:25:06 +0000 (20:25 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2"
am:
8150581742
Change-Id: I71e7bd9ccdb20ca78e4c8e1b2f653363d668425c
Treehugger Robot [Thu, 26 Jan 2017 19:51:36 +0000 (19:51 +0000)]
Merge "wifi: WifiManager API change for supporting Passpoint Release 2"
Pavlin Radoslavov [Thu, 26 Jan 2017 19:31:07 +0000 (19:31 +0000)]
Merge "Integration of the AAC codec for A2DP source" am:
22f97c83fb am:
f23e80bb9b
am:
d364208388
Change-Id: Ice6067732c4a94d30410a8f90cbea51b869539eb
Pavlin Radoslavov [Thu, 26 Jan 2017 19:25:37 +0000 (19:25 +0000)]
Merge "Integration of the AAC codec for A2DP source" am:
22f97c83fb
am:
f23e80bb9b
Change-Id: If2d85eba17f7ece5b3d19e3ee8fc86b7cf9bc062
Pavlin Radoslavov [Thu, 26 Jan 2017 19:20:08 +0000 (19:20 +0000)]
Merge "Integration of the AAC codec for A2DP source"
am:
22f97c83fb
Change-Id: I22838db2b87f83a3832f78d74d08a6f988264284
Treehugger Robot [Thu, 26 Jan 2017 19:12:54 +0000 (19:12 +0000)]
Merge "Integration of the AAC codec for A2DP source"
Peter Qiu [Thu, 19 Jan 2017 23:51:27 +0000 (15:51 -0800)]
wifi: WifiManager API change for supporting Passpoint Release 2
The changes include:
- Split WNM notifications intent to dedicated intent for each
event: Deauth Imminent Notice and Subscription Remediation
- Add intent for broadcast OSU Providers List
- Update Passpoint icon intent definitions to conform to the
API guide
- Make WifiManager#queryPasspointIcon public
All added/updated intents will required receiver to have
android.Manifest.permission.ACCESS_WIFI_STATE in order to
receive the intents.
The deprecated hidden intent definitions will be removed once
the WifiService is updated to use the new intents.
Bug:
34198926
Test: make -j32
Change-Id: If28a5710f68271069c663a953538f920512e3240
Merged-In: Ic17eef8364d79144eb530c68c6877712efcb5209
Pavlin Radoslavov [Sat, 14 Jan 2017 08:41:05 +0000 (00:41 -0800)]
Integration of the AAC codec for A2DP source
Test: A2DP streaming to AAC headsets
Bug:
30958229
Change-Id: I1b530f1c5c495b8231fd68bed788d4567096683d
Michal Karpinski [Thu, 26 Jan 2017 14:58:41 +0000 (14:58 +0000)]
Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev
am:
c399e4d964
Change-Id: I9658d27ee9a694c580204f0e041991d754f93130
Michal Karpinski [Thu, 26 Jan 2017 14:58:36 +0000 (14:58 +0000)]
DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm
am:
1710e5f079
Change-Id: I6ffab66a6464f7fbb337d6bcb1431a0a960e25e3
Michal Karpinski [Thu, 26 Jan 2017 14:52:16 +0000 (14:52 +0000)]
Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev
Michal Karpinski [Wed, 25 Jan 2017 16:53:12 +0000 (16:53 +0000)]
DO NOT MERGE Change batch finalization timeout mechanism from
Handler#sendMessageDelayed() to a wakeful alarm
Messages sent with Handler#sendMessageDelayed() didn't get delivered
until the device woke up after being idle, which resulted in
potentially very long windows of logs accumulation and highly possible
network log loss from before the device becaming idle.
Bug:
34157435
Test: manual with decreased timeout over a few timeout iterations
Change-Id: I22d9cc743acb1a478d2da5407c5718e7f95e89cb
ltrochtova [Thu, 26 Jan 2017 09:58:53 +0000 (09:58 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am:
2c1e396382 am:
c0118ac10e
am:
3db1ff462a
Change-Id: I846e7d5b84fb953f93256c8c6d2ca18d37199f1f
ltrochtova [Thu, 26 Jan 2017 09:53:23 +0000 (09:53 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am:
2c1e396382
am:
c0118ac10e
Change-Id: I2aede50aba4c693f6bc45d2e53a0f4b7d8303c32
ltrochtova [Thu, 26 Jan 2017 09:48:23 +0000 (09:48 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am:
2c1e396382
Change-Id: I132bdd6aee36e32ddbcfdc8f38aed1e88424297e
ltrochtova [Thu, 26 Jan 2017 09:41:51 +0000 (09:41 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
Bill Yi [Thu, 26 Jan 2017 07:16:06 +0000 (07:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
36f8170bbc -s ours
Change-Id: If96f86dd128b899982a82f27a54b3682c86123b0
Bill Yi [Thu, 26 Jan 2017 07:16:01 +0000 (07:16 +0000)]
Import translations. DO NOT MERGE
am:
30b5edfd23 -s ours
Change-Id: I8e401e5b1cdfa7506384c1aeab219697360bcf79
Bill Yi [Thu, 26 Jan 2017 07:14:41 +0000 (07:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
6201ee5c68 -s ours
Change-Id: I02412d6d4a77f847f3eef6e822664cc10dd6768e
Bill Yi [Thu, 26 Jan 2017 07:14:36 +0000 (07:14 +0000)]
Import translations. DO NOT MERGE
am:
9c0c94c1b5 -s ours
Change-Id: I8c629cb66f2c962598e4ec221432c6d0c1ab6a85
TreeHugger Robot [Thu, 26 Jan 2017 07:10:23 +0000 (07:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 26 Jan 2017 07:07:36 +0000 (07:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Winson Chung [Thu, 26 Jan 2017 01:58:56 +0000 (17:58 -0800)]
DO NOT MERGE Fixing crash in SystemUI fetching task description icons.
When we compose the TaskDescription for the task, we update it with
information from each activity from top down. If an activity has a
saved icon, the filepath for that icon will be encoded with the user
id of the activity and saved into the task description. However, if
that activity's user is different from the user id of the root
activity of the task, we will later try to fetch the icon with the
user id of the task which will cause an exception to be thrown.
Instead, because the task description describes the task and information
belonging to the task description is always fetched as the user of
that task, we can save the icon with the task's user encoded instead
of the activity's.
Bug:
34692261
Test: Launch primary user activity with a custom task description icon
in a task that is rooted with a work profile activity, then restart
before the primary user activity is finished.
Change-Id: I66240cd488271e677cce7923cfef8e3e0cea5621
Android Build Merger (Role) [Thu, 26 Jan 2017 04:46:37 +0000 (04:46 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4 am:
6cc3802e50 am:
b69d7554d7" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Thu, 26 Jan 2017 04:46:21 +0000 (04:46 +0000)]
Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4 am:
6cc3802e50 am:
44cafbb018" into nyc-mr2-dev-plus-aosp
Elliot Waite [Thu, 26 Jan 2017 04:45:59 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4 am:
6cc3802e50
am:
b69d7554d7
Change-Id: I3222069c804f524d29eebb0bde502aec5a92c04f
Elliot Waite [Thu, 26 Jan 2017 04:45:49 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4 am:
6cc3802e50
am:
44cafbb018
Change-Id: I77fd396040a31c69d98e3ca9d2bddd4f2632419f
Android Build Merger (Role) [Thu, 26 Jan 2017 04:45:36 +0000 (04:45 +0000)]
Merge "Fix @links in reference docs. am:
54de77470d am:
ab978c035e am:
de2557f369" into nyc-mr2-dev-plus-aosp
Elliot Waite [Thu, 26 Jan 2017 04:44:56 +0000 (04:44 +0000)]
Fix @links in reference docs. am:
54de77470d am:
ab978c035e
am:
de2557f369
Change-Id: I3d4637ec03906dd520edaeadecdfe2fd4faa471b
Elliot Waite [Thu, 26 Jan 2017 04:44:54 +0000 (04:44 +0000)]
Fix @links in reference docs. am:
54de77470d am:
ab978c035e
am:
28ba4722a9
Change-Id: I98177a8cf0a20677e140406bb7371474ca259e5b
Elliot Waite [Thu, 26 Jan 2017 04:40:54 +0000 (04:40 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4
am:
6cc3802e50
Change-Id: I9b581b9a8be3d5d10abfbbc5770301fe67f94f78
Elliot Waite [Thu, 26 Jan 2017 04:40:47 +0000 (04:40 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4
am:
6cc3802e50
Change-Id: I52ddc7a726e5b12d136e0e524225422e5e6aa1a6
Pavlin Radoslavov [Thu, 26 Jan 2017 04:40:43 +0000 (04:40 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am:
0645c21163 am:
b3f1eaa504
am:
e667f7795f
Change-Id: Ia6722702175e196d5b980ec7be3a093e972cfbfb
Elliot Waite [Thu, 26 Jan 2017 04:39:57 +0000 (04:39 +0000)]
Fix @links in reference docs. am:
54de77470d
am:
ab978c035e
Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
Elliot Waite [Thu, 26 Jan 2017 04:39:53 +0000 (04:39 +0000)]
Fix @links in reference docs. am:
54de77470d
am:
ab978c035e
Change-Id: Ibec2b85708f9ff923156f4d867c9c2f71c75d41c
Steve McKay [Thu, 26 Jan 2017 04:38:25 +0000 (04:38 +0000)]
Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev
am:
32e6da5b84
Change-Id: I7a90eb649be34b2f99af885ad4559fa9e1d5f727
Steve McKay [Thu, 26 Jan 2017 04:35:46 +0000 (04:35 +0000)]
DO NOT MERGE: Allow launcher icon to be config'd in overlay.
am:
24cd592b24
Change-Id: Id9f70ccb67f48c4b4b290fd493f3e7725f1b7a5b
Elliot Waite [Thu, 26 Jan 2017 04:35:00 +0000 (04:35 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev
am:
3366d4beb4
Change-Id: I90aa2e4ca0553d5816024486015514b3e5d7bc86
Pavlin Radoslavov [Thu, 26 Jan 2017 04:34:57 +0000 (04:34 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am:
0645c21163
am:
b3f1eaa504
Change-Id: Ie1f0e958b93bfb898a7fdbe3ed8f732190a3e7ac
Elliot Waite [Thu, 26 Jan 2017 04:34:57 +0000 (04:34 +0000)]
Fix @links in reference docs.
am:
54de77470d
Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
TreeHugger Robot [Thu, 26 Jan 2017 04:31:36 +0000 (04:31 +0000)]
Merge "DO NOT MERGE: Allow launcher icon to be config'd in overlay." into nyc-mr2-dev
Pavlin Radoslavov [Thu, 26 Jan 2017 04:29:57 +0000 (04:29 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
am:
0645c21163
Change-Id: I66a7a5f8dc423c7999b4e0a39a272a837e66c847
Elliot Waite [Thu, 26 Jan 2017 04:29:43 +0000 (04:29 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev
Treehugger Robot [Thu, 26 Jan 2017 04:23:42 +0000 (04:23 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
Bill Yi [Thu, 26 Jan 2017 03:35:15 +0000 (19:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d22b911e1f4a4828ef3eb5eed69b3ccc112552e
Auto-generated-cl: translation import
Brad Ebinger [Thu, 26 Jan 2017 01:49:53 +0000 (01:49 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)" am:
8e6b13a1c0 am:
64057ab972
am:
2741442324
Change-Id: Ibd5c988226e7994c332a7e7f8b40a9338cf84e0f
Bill Yi [Thu, 26 Jan 2017 01:47:34 +0000 (17:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ied49499c963a70d4cadba0789f513ec9a056d16b
Auto-generated-cl: translation import
Brad Ebinger [Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)" am:
8e6b13a1c0
am:
64057ab972
Change-Id: I901c72a38b522c190e849de55078036adc80d8b6
Brad Ebinger [Thu, 26 Jan 2017 01:41:38 +0000 (01:41 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
am:
8e6b13a1c0
Change-Id: I8534273da5579b7662e66f80a60348a4665dd65b
Treehugger Robot [Thu, 26 Jan 2017 01:34:04 +0000 (01:34 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
Elliot Waite [Wed, 11 Jan 2017 23:30:35 +0000 (15:30 -0800)]
Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
Brad Ebinger [Mon, 23 Jan 2017 23:17:50 +0000 (15:17 -0800)]
Adding Dynamic ImsService Binding (1/3)
Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option
Test: Unit Tests in opt/telephony
Bug:
30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3
Pavlin Radoslavov [Wed, 25 Jan 2017 22:00:02 +0000 (14:00 -0800)]
Fix wording ambiguity for Bluetooth LDAC Playback Quality selection
"Optimize for" -> "Optimized for"
Bug:
34687041
Test: UI Visual inspection
Change-Id: I112ed6451465750978181e6ee35f96fd76969e9c
Android Build Merger (Role) [Wed, 25 Jan 2017 21:31:03 +0000 (21:31 +0000)]
Merge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am:
55772c73c0" into nyc-mr2-dev-plus-aosp
Jerry Zhang [Wed, 25 Jan 2017 21:30:07 +0000 (21:30 +0000)]
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev
am:
55772c73c0
Change-Id: Ie41c7e8b7a687e9836354d429e66b5f214a6d0b2
Josh Gao [Wed, 25 Jan 2017 21:30:03 +0000 (21:30 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am:
273b886c49 am:
e801810553
am:
a07e5312cc
Change-Id: I9165a6dc33058ec4f7bd8a6c6f4426af405bda19
Josh Gao [Wed, 25 Jan 2017 21:25:23 +0000 (21:25 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am:
273b886c49
am:
e801810553
Change-Id: I636c0f021c6ffae4518d889b1e7c4c3c29c6e864
Jerry Zhang [Wed, 25 Jan 2017 21:23:54 +0000 (21:23 +0000)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am:
4882496232 -s ours
Change-Id: Ia50fbb88cdaa9e3570b68798b82df609475b5fe6
Jerry Zhang [Wed, 25 Jan 2017 21:22:54 +0000 (21:22 +0000)]
Clean up persistent usb state on boot.
am:
bfc5d563aa -s ours
Change-Id: Idd46b3f5a0c3a608a3178855b67afbce1cf21acb
Jerry Zhang [Wed, 25 Jan 2017 21:22:07 +0000 (21:22 +0000)]
Fixed handling of usb state during adb changes.
am:
541295a9a5 -s ours
Change-Id: I608202f6c74d0209f5507f838f103f874ed47e3b
Josh Gao [Wed, 25 Jan 2017 21:21:29 +0000 (21:21 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am:
273b886c49
Change-Id: I82c58cd03c8db78a1733ba5070d314607475cee7
Josh Gao [Wed, 25 Jan 2017 21:16:57 +0000 (21:16 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
Steve McKay [Wed, 25 Jan 2017 18:19:06 +0000 (10:19 -0800)]
DO NOT MERGE: Allow launcher icon to be config'd in overlay.
Bug:
34441010
Test: Build and view in launcher.
Change-Id: I1f6cb4f2f6cb234e55aac1657aa6cdaa4a22550f
Jerry Zhang [Wed, 25 Jan 2017 20:30:17 +0000 (20:30 +0000)]
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev
* changes:
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
Clean up persistent usb state on boot.
Fixed handling of usb state during adb changes.
George Burgess IV [Wed, 25 Jan 2017 20:19:05 +0000 (20:19 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am:
500cf67206 am:
f77f2cb3e7
am:
0c6283e396
Change-Id: Ife5d9444f9036c16540bd7bf7a1c0e17cf296df5
George Burgess IV [Wed, 25 Jan 2017 20:14:00 +0000 (20:14 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am:
500cf67206
am:
f77f2cb3e7
Change-Id: I44e23c5689b51ae002a8db71a537ab97d3f31121
George Burgess IV [Wed, 25 Jan 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
am:
500cf67206
Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c
Ruchi Kandoi [Wed, 25 Jan 2017 20:07:23 +0000 (20:07 +0000)]
Merge "nfc: Make NDEF validation stricter" am:
f3a6269fed am:
e6cb2aa614
am:
40c14a83d0
Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d
Josh Gao [Wed, 25 Jan 2017 19:45:58 +0000 (11:45 -0800)]
zygote: don't drop CAP_SYS_PTRACE from the bounding set.
crash_dump needs to acquire CAP_SYS_PTRACE to be able to ptrace
processes with capabilities. selinux should hopefully be sufficient for
restricting ptrace to processes that should do it.
Bug: http://b/
34694637
Test: debuggerd `pidof system_server`
Change-Id: If46f0b9baa54529780f7767f309f76b102a42ab4
Ruchi Kandoi [Wed, 25 Jan 2017 20:03:00 +0000 (20:03 +0000)]
Merge "nfc: Make NDEF validation stricter" am:
f3a6269fed
am:
e6cb2aa614
Change-Id: Ib069a18f16850d419b6c10c3b80e80115d9d8fc8
Treehugger Robot [Wed, 25 Jan 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
Ruchi Kandoi [Wed, 25 Jan 2017 19:59:16 +0000 (19:59 +0000)]
Merge "nfc: Make NDEF validation stricter"
am:
f3a6269fed
Change-Id: If69e586c81e5926c0795af3689de67b260891eaa
Treehugger Robot [Wed, 25 Jan 2017 19:53:59 +0000 (19:53 +0000)]
Merge "nfc: Make NDEF validation stricter"
Lenka Trochtova [Tue, 17 Jan 2017 09:35:49 +0000 (10:35 +0100)]
Don't offer the BT sharing option to the user if BT is disallowed.
Disable BluetoothOppLauncherActivity component if the
UserManager#BLUETOOTH_DISALLOWED user restriction is set.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895060
Bug:
34239380
Change-Id: I3467c82881896f276f542583bb50807b5e27276b
Andre Eisenbach [Wed, 25 Jan 2017 18:23:50 +0000 (18:23 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am:
35c715332f am:
36ce9b7ea0
am:
8b1d096e58
Change-Id: I4fd28828d5ed8ec2a3e93b6f8ab074dccdcb30e2
Ruchi Kandoi [Wed, 25 Jan 2017 02:32:01 +0000 (18:32 -0800)]
nfc: Make NDEF validation stricter
- Check if the MB is not set for any record apart from the first one.
- If the record is chunked, first record must contain the type
Bug:
20722275
Test: Manual; write raw NDEF messages to a tag
Change-Id: I3e73fc5163bbcd8a1f23417e98f57b665f4f1fad
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Peter Qiu [Thu, 19 Jan 2017 00:00:45 +0000 (16:00 -0800)]
hotspot2: added remaining parameters to PasspointConfiguration
Added remaining parameters to PasspointConfiguration to support complete
PerProviderSubscription tree for Release 2 support.
The new parameters include:
- Update identifier
- Credential priority
- AAA server trust root
- Subscription update
- Subscription parameters
Bug:
34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: If50253612f7777b3b693a344378a2e4810b3ff47
Andre Eisenbach [Wed, 25 Jan 2017 18:19:51 +0000 (18:19 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am:
35c715332f
am:
36ce9b7ea0
Change-Id: I3381764156fadf755d679b9a3c9356fc90e50fd2
Andre Eisenbach [Wed, 25 Jan 2017 18:16:27 +0000 (18:16 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
am:
35c715332f
Change-Id: I7c603ab9f50921afb45e3d7181541260d8939089
Peter Qiu [Tue, 17 Jan 2017 19:41:27 +0000 (11:41 -0800)]
hotspot2: add support for complete PerProviderSubscription/Policy subtree
Added Policy to PasspointConfiguration and the corresponding parser
support in PPSMOParser.
While there, fix a typo in node name "CertSHA256Fingerprint" under
CertificateCredential.
Bug:
34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Iabe27cd83b6658ed7d4f895d7fe2255fe2094ebb
Andre Eisenbach [Wed, 25 Jan 2017 18:05:10 +0000 (18:05 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
Marie Janssen [Wed, 18 Jan 2017 17:37:52 +0000 (09:37 -0800)]
Bluetooth: fix indentation, formatting in dumpsys
Before
======
Enable log:
01-17 09:43:18 Enabled by com.android.systemui
01-18 07:13:10 Disabled by com.andorid.systemui
1 BLE Apps registered:
com.google.android.gms
After
=====
Enable log:
02-06 07:49:07 Enabled by system boot
02-06 07:49:35 Disabled by com.andorid.systemui
1 BLE App registered:
com.google.android.gms
Test: run bugreport, see differences in dumpsys
Change-Id: I6086f7f97c1fcbdb860d70d9516fd5bf630a9f5e
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:47 +0000 (16:08 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
am:
a60f7151e6
Change-Id: I11be13e9f6404cc74fa44cb6a8278a019634ecf1
Andrew Sapperstein [Wed, 25 Jan 2017 16:08:41 +0000 (16:08 +0000)]
Decrease frequency of high temp warnings
am:
97bfa0f17d
Change-Id: I48237148a12cbf8b11df798001aa5c99428a6daa
Andrew Sapperstein [Wed, 25 Jan 2017 16:01:04 +0000 (16:01 +0000)]
Merge "Decrease frequency of high temp warnings" into nyc-mr2-dev
OSDN Git Service
