OSDN Git Service
Tyler Gunn [Wed, 20 Sep 2017 21:31:53 +0000 (21:31 +0000)]
Merge "De-couple data enabled from VT settings." am:
29fc1d78a9
am:
c7588904ba
Change-Id: I8b0d606848baa6cec1543a95b87ddf0cf0ba1ec6
Tyler Gunn [Wed, 20 Sep 2017 21:25:44 +0000 (21:25 +0000)]
Merge "De-couple data enabled from VT settings."
am:
29fc1d78a9
Change-Id: I39c1ec07eb087830605b603dbf420bfa6a4385f2
Tyler Gunn [Wed, 20 Sep 2017 20:19:30 +0000 (20:19 +0000)]
Merge "De-couple data enabled from VT settings."
Tyler Gunn [Wed, 20 Sep 2017 19:03:24 +0000 (19:03 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice." am:
9cc6286675
am:
53a0c05f47
Change-Id: I1aa5936c8246cae56d886573f116b8d55a70834d
Tyler Gunn [Wed, 20 Sep 2017 18:54:34 +0000 (18:54 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice."
am:
9cc6286675
Change-Id: Ie7b6f251a29d1be706382e93f6f368fd8b8e1cc7
Tyler Gunn [Wed, 20 Sep 2017 18:20:04 +0000 (18:20 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice."
Tyler Gunn [Wed, 7 Jun 2017 22:42:39 +0000 (15:42 -0700)]
Add Telephony connection event for call forwarded supp service notice.
Test: Test Harness
Bug:
33761801
Merged-In: I5503232f90b3255df601be3f16443e8ae311a479
Change-Id: I8ffc8079b43c54594e596f29cec641ca051d4796
Jason Monk [Wed, 20 Sep 2017 17:00:20 +0000 (17:00 +0000)]
Merge "Fix random systemui crashes during boot" am:
8078996f4a -s ours
am:
7b4087acdb
Change-Id: Ib5f08316a5ae559fe8fab09601607e523bd32793
Eric Laurent [Wed, 20 Sep 2017 16:54:43 +0000 (16:54 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets
am:
630f37a4ad
Change-Id: Ib9a3ebae93073018fc4bda0d2dc36c5fc1fdac92
Jason Monk [Wed, 20 Sep 2017 16:53:13 +0000 (16:53 +0000)]
Merge "Fix random systemui crashes during boot"
am:
8078996f4a -s ours
Change-Id: I97b1d904c2e37aff4ade169d0f76d7f0d123fc5b
Tyler Gunn [Thu, 17 Aug 2017 22:58:47 +0000 (15:58 -0700)]
De-couple data enabled from VT settings.
The existing KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS has the impact
of decoupling whether VT is enabled from whether mobile data is enabled.
Making this TRUE by default.
Adding a new carrier config option to indicate whether VILTE data is metered.
This, coupled with KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS allows
us to ensure that wifi video calls can be made, while still ensuring that
mobile data is not used for VT calls.
A carrier config update needs to be made for the few instances where
KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS was set true to ensure
that KEY_VILTE_DATA_IS_METERED_BOOL is false in that case.
Test: Manual
Bug:
36900451
Merged-In: I424cd828a7616c2947367bdb4a82a62cf17847e7
Change-Id: I037f8930901907b55e4245a655e0480668549185
Neil Fuller [Wed, 20 Sep 2017 14:55:08 +0000 (14:55 +0000)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master
am:
8acdb8aa65
Change-Id: I7605323c886c9dafb83899c8b78e2bb860f96bb4
Jason Monk [Wed, 20 Sep 2017 13:50:45 +0000 (13:50 +0000)]
Merge "Fix random systemui crashes during boot"
Neil Fuller [Wed, 20 Sep 2017 12:43:28 +0000 (13:43 +0100)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3dc2e0b10bbf5be9c7d8f98b03cf8030bbfff07
Treehugger Robot [Wed, 20 Sep 2017 12:08:58 +0000 (12:08 +0000)]
Merge "Fix reliability triggering"
Jordan Liu [Wed, 20 Sep 2017 00:04:56 +0000 (00:04 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7
am:
649f3bf73f
Change-Id: If8b12685886ccbdecdb4e123629edc4e3426711d
Jordan Liu [Tue, 19 Sep 2017 23:55:48 +0000 (23:55 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
am:
c8ad4a82c7
Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17
Jordan Liu [Tue, 19 Sep 2017 23:39:42 +0000 (23:39 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
Fyodor Kupolov [Tue, 19 Sep 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29
am:
c17b4e5a14
Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee
Fyodor Kupolov [Tue, 19 Sep 2017 18:42:07 +0000 (18:42 +0000)]
Merge "Fix AddAccountSettings memory leak"
am:
104501fa29
Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86
Fyodor Kupolov [Tue, 19 Sep 2017 18:29:14 +0000 (18:29 +0000)]
Merge "Fix AddAccountSettings memory leak"
Tyler Gunn [Tue, 19 Sep 2017 16:44:26 +0000 (16:44 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda
am:
8b2e421025
Change-Id: I2b73595add333660c2a4b62538334b8cb38ac9cb
Tyler Gunn [Tue, 19 Sep 2017 16:37:38 +0000 (16:37 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
am:
99d28ebbda
Change-Id: I99ff94901868d3b16a20a6592e106bc0645b863e
Tyler Gunn [Tue, 19 Sep 2017 16:28:52 +0000 (16:28 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
Eric Laurent [Fri, 1 Sep 2017 22:12:42 +0000 (15:12 -0700)]
AudioService: reduce EU volume warning thresdhold for USB headsets
Take into account additional gain due to simultaneous application of
EQ and bass boost by substracting 7dB from current warning message threshold.
Bug:
65225835
Test: check warning displayed when playing over USB headset after boot when
no SIM is present
Change-Id: I1bfcbf571d72122f4df6ff5e40be227c42d555e3
(cherry picked from commit
0e5deb3967398834c9d2321b31d3c56b380e98b5)
Neil Fuller [Wed, 13 Sep 2017 20:59:59 +0000 (21:59 +0100)]
Fix reliability triggering
Fix reliability triggering in the time zone update
feature. The reliability triggering is there to
resume an update check when things go wrong. For
example, if the device is turned off after a
time zone data app is updated but before the time
zone update process has finished pulling the data
out and installing it in /data. The reliability
trigger happens when the device is idle and will
complete the work.
The idle triggering currently doesn't work as it
was implemented incorrectly.
The code has been changed to use the
JobScheduler to trigger on idle and scheduling
has been made explicit.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual testing: adb shell am idle-maintenance, adb logcat/adb shell dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug:
65657543
Change-Id: Ibb2c537955d09a5d538c50490dae94a518522f19
Merged-In: Ibb2c537955d09a5d538c50490dae94a518522f19
(cherry picked from commit
cd1a109b872f58f5baa0ce8438bf3ddd69eec9fc)
Nicolas Geoffray [Tue, 19 Sep 2017 12:03:38 +0000 (12:03 +0000)]
Merge "Special handling of priv-apps in Zygote." am:
46af70cad9
am:
79d4ef6caa
Change-Id: Ice349c6b6160ad89ba1c8543acf3e678a1473a25
Nicolas Geoffray [Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)]
Merge "Special handling of priv-apps in Zygote."
am:
46af70cad9
Change-Id: I1dbf2313c9ee1c014854630eac5f1429548ae7f6
Nicolas Geoffray [Tue, 19 Sep 2017 11:47:58 +0000 (11:47 +0000)]
Merge "Special handling of priv-apps in Zygote."
Charles He [Tue, 19 Sep 2017 08:17:05 +0000 (08:17 +0000)]
Merge changes from topic "vpn-dialog" am:
19bb1a0b99
am:
7e75870d11
Change-Id: Ifb581e7b40d52b2378b347ff62669713be344093
Charles He [Tue, 19 Sep 2017 08:09:45 +0000 (08:09 +0000)]
Merge changes from topic "vpn-dialog"
am:
19bb1a0b99
Change-Id: I168072aa2bfdb9ed7630cf50547cb9732fb29280
Charles He [Tue, 19 Sep 2017 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "always-on-vpn" am:
cc15c7f8c1
am:
692b55390f
Change-Id: I3931c053c4daff092b06e3e1d673817708762a62
Charles He [Tue, 19 Sep 2017 08:01:45 +0000 (08:01 +0000)]
Merge changes from topic "always-on-vpn"
am:
cc15c7f8c1
Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
Charles He [Tue, 19 Sep 2017 07:56:44 +0000 (07:56 +0000)]
Merge changes from topic "vpn-dialog"
* changes:
Unbreak VPN unit tests.
Add alert dialog when always-on VPN disconnects.
Charles He [Wed, 16 Aug 2017 12:14:13 +0000 (13:14 +0100)]
Unbreak VPN unit tests.
VpnTest was broken earlier due to a change to always-on VPN
notifications. This CL adds the corresponding mocks to the unit test to
fix it.
Bug:
36650087
Bug:
65439160
Test: runtest frameworks-net
Change-Id: Icff57c7e927c135d75a7d70ff347a579c5d45134
Merged-In: Icff57c7e927c135d75a7d70ff347a579c5d45134
(cherry picked from commit
3da6a1fc82b7e0c7adc88b92e50cceec8173672e)
Charles He [Tue, 19 Sep 2017 07:50:13 +0000 (07:50 +0000)]
Merge changes from topic "always-on-vpn"
* changes:
Opt-out for always-on VPN: rename API.
Opt-out for always-on VPN
Hugo Benichi [Tue, 19 Sep 2017 07:29:09 +0000 (07:29 +0000)]
Merge "Wakeup packet events: addressing a few comments" am:
67d16ec1ab
am:
a35bbadeba
Change-Id: I33eeb421cff21efdaa409d27fb130ff4754ac6b0
Hugo Benichi [Tue, 19 Sep 2017 07:21:12 +0000 (07:21 +0000)]
Merge "Wakeup packet events: addressing a few comments"
am:
67d16ec1ab
Change-Id: I67b2e54d45a39005e2091a46e8b90d8cc75fe079
Hugo Benichi [Tue, 19 Sep 2017 07:12:03 +0000 (07:12 +0000)]
Merge "Wakeup packet events: addressing a few comments"
Rubin Xu [Tue, 19 Sep 2017 06:45:04 +0000 (06:45 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am:
430d8472b2
am:
082234f4aa
Change-Id: Iedfbc9a6505611d1a30c348ab15f4fb5b62238eb
Rubin Xu [Tue, 19 Sep 2017 06:37:40 +0000 (06:37 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
am:
430d8472b2
Change-Id: If87f8c43371ee1f5e2e893232c9e340a1a7339f4
Treehugger Robot [Tue, 19 Sep 2017 06:28:21 +0000 (06:28 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
Hugo Benichi [Tue, 19 Sep 2017 04:15:26 +0000 (13:15 +0900)]
Wakeup packet events: addressing a few comments
This patch addresses a few post-submit comment for
commits
f562ac34a51dc and
60c9f63b66921.
Bug:
34901696
Bug:
62179647
Test: runtest frameworks-net
Change-Id: I4abec57e0c6bc869dc57b5eb54582dd977b64c30
Steven Moreland [Tue, 19 Sep 2017 03:29:20 +0000 (03:29 +0000)]
Merge "Remove unused variable from screencap." am:
376234fc74
am:
32bdb1e9b0
Change-Id: If4c2b39333270982975feb1745b3bbaaa3a177b8
Steven Moreland [Tue, 19 Sep 2017 03:22:42 +0000 (03:22 +0000)]
Merge "Remove unused variable from screencap."
am:
376234fc74
Change-Id: I5afb38c24ab6924925ab2852c5fe0ef29a91a2ff
Treehugger Robot [Tue, 19 Sep 2017 03:12:18 +0000 (03:12 +0000)]
Merge "Remove unused variable from screencap."
Pengquan Meng [Tue, 19 Sep 2017 01:31:24 +0000 (01:31 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information" am:
2bcc7fac89
am:
74bd3daaac
Change-Id: Idc00a34295cdcbefa19636643bff3c3bf2323446
Pengquan Meng [Tue, 19 Sep 2017 01:23:53 +0000 (01:23 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"
am:
2bcc7fac89
Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
Pengquan Meng [Tue, 19 Sep 2017 01:14:34 +0000 (01:14 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"
Erika Avenberg [Sat, 30 Aug 2014 10:00:47 +0000 (12:00 +0200)]
Incorrect decoding when TP-OA contains non-integer information
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.
This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0
Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
information in the semi-octets other than "1111" (e.g. 1110)
it shall display the semi-octet as the representation given
in GSM 44.008 [12] under "called BCD number", viz 1010="*",
1011="#", 1100="a", 1101="b", 1110="c"."
Bug:
65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
Bill Yi [Mon, 18 Sep 2017 20:16:41 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
69ca32dcea -s ours
am:
60af01bec9 -s ours
Change-Id: I920bb3060556824d8185701b10ea71828e242591
Bill Yi [Mon, 18 Sep 2017 20:07:14 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
69ca32dcea -s ours
Change-Id: I59c5213db2534724e11d0eadf049d9d5489ffa18
Bill Yi [Mon, 18 Sep 2017 20:05:45 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours am:
456c147827 -s ours
am:
c49cdb6749 -s ours
Change-Id: Ief5061ef3933b7e1447e235923a52d741fc8fa7e
Bill Yi [Mon, 18 Sep 2017 19:56:59 +0000 (19:56 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours am:
fee3748d04 -s ours
am:
456c147827 -s ours
Change-Id: I029764bb19cc295e4749d8974461f6d6be23d5c2
TreeHugger Robot [Mon, 18 Sep 2017 19:31:18 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Mon, 18 Sep 2017 19:16:08 +0000 (19:16 +0000)]
Import translations. DO NOT MERGE am:
791ebeed32 -s ours
am:
fee3748d04 -s ours
Change-Id: I4d666020e912f122850cc140e3f62d65aea029ca
Bill Yi [Mon, 18 Sep 2017 19:09:21 +0000 (19:09 +0000)]
Import translations. DO NOT MERGE
am:
791ebeed32 -s ours
Change-Id: Iff6d60fe8fd1444c88ffa76634a50a4bb377334d
Julia Reynolds [Mon, 18 Sep 2017 18:16:38 +0000 (18:16 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev am:
9c32669043 -s ours
am:
beb14f16fd
Change-Id: I4389c9502a6b8dd0224ec4323bbbe2599133de15
Julia Reynolds [Mon, 18 Sep 2017 18:09:02 +0000 (18:09 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev
am:
9c32669043 -s ours
Change-Id: I890f0e8e36b5c397365af8d9eb7f84d1d9a7a719
fionaxu [Mon, 18 Sep 2017 18:06:26 +0000 (18:06 +0000)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
am:
6e40562a73
Change-Id: I804a1cebba2b8fb297bd8dda9a74ae8736334e3b
Ruina Liu [Mon, 18 Sep 2017 18:00:58 +0000 (18:00 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am:
ac421b8f44
am:
8c65620d31
Change-Id: I70ded26f7487e0cf0cbb2f3fa1184c85ed00b765
fionaxu [Fri, 15 Sep 2017 20:52:04 +0000 (13:52 -0700)]
resolve merge conflicts of
6df58d8da10d to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
Ruina Liu [Mon, 18 Sep 2017 17:53:31 +0000 (17:53 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am:
ac421b8f44
Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36
Treehugger Robot [Mon, 18 Sep 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
TreeHugger Robot [Mon, 18 Sep 2017 17:35:06 +0000 (17:35 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dev
Bill Yi [Mon, 18 Sep 2017 15:21:35 +0000 (08:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6a56e46644120a42a4a0cff43dfd5f8b61ca6f8f
Bill Yi [Mon, 18 Sep 2017 05:12:38 +0000 (22:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icff28a8957c2a3192b2aeaf0d646c866eb2ebbd8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Ruina Liu [Sat, 22 Jul 2017 10:41:48 +0000 (18:41 +0800)]
Fix extracting 32-bit uuid error via calling method uuidToBytes
A new defined method of uuidToBytes is used to convert
Bluetooth uuid to bytes in the case of BLE advertising.
But the most significant 16 bits of a 32-bit uuid
will be cleared after the and operations with
0X0000FFFF00000000L in the function of
getServiceIdentifierFromParcelUuid.
0XFFFFFFFF00000000L should be used as bit mask.
Change-Id: I83e22ffbecd718540e644289fee12bf9c3b66305
Test: Advertise with payload contains 32-bit uuid
Chen Xu [Fri, 15 Sep 2017 17:54:26 +0000 (17:54 +0000)]
Merge "disable carrier actions on redirection by default" into oc-dev
Neil Fuller [Fri, 15 Sep 2017 16:53:24 +0000 (16:53 +0000)]
Merge "Fix a no-op uninstall being treated as a failure" am:
fab8162abd
am:
1157a7196b
Change-Id: I9f8a65fcb375678dc1290c155ec2c755fb5bfd62
Neil Fuller [Fri, 15 Sep 2017 16:47:07 +0000 (16:47 +0000)]
Merge "Fix a no-op uninstall being treated as a failure"
am:
fab8162abd
Change-Id: I6478c02a4f37f7346a58cd980c21980234c50fec
Treehugger Robot [Fri, 15 Sep 2017 16:38:38 +0000 (16:38 +0000)]
Merge "Fix a no-op uninstall being treated as a failure"
Neil Fuller [Thu, 14 Sep 2017 08:34:56 +0000 (09:34 +0100)]
Fix a no-op uninstall being treated as a failure
Treat a stageUninstall() doing nothing as a success, not a
failure. This prevents the system retrying the uninstall
later.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual testing, adb dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug:
65657176
Merged-in: Ifd205da90e848552711ac3f4207cd22ad2c2747b
Change-Id: Ifd205da90e848552711ac3f4207cd22ad2c2747b
(cherry picked from commit
8e27c9226b82f41279ee6c108d2b06bb6f1cef5e)
Rubin Xu [Fri, 15 Sep 2017 10:51:39 +0000 (11:51 +0100)]
Fix LinkPropertiesTest.testCompareResult
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Change-Id: Ie97b7a7a1557b14296d7c33e98991cdede8463b0
Hall Liu [Fri, 15 Sep 2017 01:54:30 +0000 (01:54 +0000)]
Merge "API council suggested edits, part 3" am:
7a4cc05d45
am:
4c4fb3bdfb
Change-Id: Ifc0a36557d8a5a1a7d19e00550ae2a1997db800f
Hall Liu [Fri, 15 Sep 2017 01:35:37 +0000 (01:35 +0000)]
Merge "Apply suggested edits to the file-download API" am:
f6c9baa0cd
am:
3934c475ce
Change-Id: Id1a1e80269263ecf10d80795cea64f16aa1f6058
Narayan Kamath [Fri, 15 Sep 2017 01:09:04 +0000 (01:09 +0000)]
Merge changes Id931d441,I83faf974 am:
89c94f67b4
am:
66d7275d39
Change-Id: Ic0d6dba2b5560b335b3be8e27a88c01c960ec0aa
Narayan Kamath [Fri, 15 Sep 2017 01:08:10 +0000 (01:08 +0000)]
Zygote: Fix race condition on package preloads. am:
a3d4230b92 -s ours
am:
f0a3c209ea -s ours
Change-Id: Ia7d6e42a813e2277a60eb4def84c106e744aea11
Kevin Hufnagle [Fri, 15 Sep 2017 00:55:42 +0000 (00:55 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ic808c82a82028169ed7aebd8c6d1b25f9e2b84cf
fionaxu [Wed, 6 Sep 2017 21:19:16 +0000 (14:19 -0700)]
disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Bug:
65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3
Hall Liu [Fri, 15 Sep 2017 00:45:05 +0000 (00:45 +0000)]
Merge "API council suggested edits, part 3"
am:
7a4cc05d45
Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450
Kevin Hufnagle [Fri, 15 Sep 2017 00:42:20 +0000 (00:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
am:
6087b990df
Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
Hall Liu [Fri, 15 Sep 2017 00:40:49 +0000 (00:40 +0000)]
Merge "Apply suggested edits to the file-download API"
am:
f6c9baa0cd
Change-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c
Hall Liu [Fri, 15 Sep 2017 00:21:58 +0000 (00:21 +0000)]
Merge "API council suggested edits, part 3"
Hall Liu [Fri, 15 Sep 2017 00:21:13 +0000 (00:21 +0000)]
Merge "Apply suggested edits to the file-download API"
Kevin Hufnagle [Fri, 15 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
Jakub Pawlowski [Fri, 15 Sep 2017 00:01:54 +0000 (00:01 +0000)]
Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6
am:
3aa179fabd
Change-Id: Ic6fe3edff44423031a2abb271bce875c05e71a88
Narayan Kamath [Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)]
Merge changes Id931d441,I83faf974
am:
89c94f67b4
Change-Id: Ifc090e141092bcee11704e45d6f97f642040d002
Narayan Kamath [Thu, 14 Sep 2017 23:55:49 +0000 (23:55 +0000)]
Zygote: Fix race condition on package preloads.
am:
a3d4230b92 -s ours
Change-Id: I6fc6b967f04a6f3cc87908b7fdba72e26a9fb025
Treehugger Robot [Thu, 14 Sep 2017 23:41:34 +0000 (23:41 +0000)]
Merge changes Id931d441,I83faf974
* changes:
Zygote: Improve logging and error handling during connections.
Zygote: Fix race condition on package preloads.
Jakub Pawlowski [Thu, 14 Sep 2017 23:36:00 +0000 (23:36 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
am:
fee4546fd6
Change-Id: If7ee44287dbec54e49df9fc350b2ebdfcdaeb431
Treehugger Robot [Thu, 14 Sep 2017 22:59:37 +0000 (22:59 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
* changes:
Fix included service parsing (3/3)
Bluetooth: fix typo in comment
Hall Liu [Sat, 9 Sep 2017 01:02:38 +0000 (18:02 -0700)]
API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.
Bug:
30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
Hall Liu [Sat, 2 Sep 2017 00:59:15 +0000 (17:59 -0700)]
Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale
Bug:
30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
Hall Liu [Thu, 14 Sep 2017 19:57:36 +0000 (19:57 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations" am:
1bbf287859
am:
200d8f6242
Change-Id: Iebea130f19c60c407a95ff1c1a3f80abd7c66925
Hall Liu [Thu, 14 Sep 2017 19:45:04 +0000 (19:45 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations"
am:
1bbf287859
Change-Id: I76662fd9822dcde781cdecafb45239e1da6337d9
Jakub Pawlowski [Thu, 14 Sep 2017 19:41:52 +0000 (19:41 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated" am:
1f53eb76e4
am:
8ab1ed1789
Change-Id: I534e04c709f6ee3f74358e9e1b3a30ad6cb64083
Jakub Pawlowski [Thu, 14 Sep 2017 18:54:59 +0000 (11:54 -0700)]
Fix included service parsing (3/3)
Bug:
65637368
Test: sl4a GattIncludedServiceTest
Change-Id: Idb967df9d5064b0532db7f5c250f677d1dbbc54c
Jakub Pawlowski [Thu, 14 Sep 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated"
am:
1f53eb76e4
Change-Id: I45642dfbb8ed8bb90a1306d066844d18aa1962b3
Hall Liu [Thu, 14 Sep 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations"