Neil Fuller
93fcfbc8cb
resolve merge conflicts of 83c367aa5b to stage-aosp-master
...
am: 8acdb8aa65
2017-09-20 14:55:08 +00:00
Neil Fuller
8acdb8aa65
resolve merge conflicts of 83c367aa5b to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3dc2e0b10bbf5be9c7d8f98b03cf8030bbfff07
2017-09-20 13:43:28 +01:00
Treehugger Robot
83c367aa5b
Merge "Fix reliability triggering"
2017-09-20 12:08:58 +00:00
Jordan Liu
56ed1f9c9d
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7
...
am: 649f3bf73f
2017-09-20 00:04:56 +00:00
Jordan Liu
649f3bf73f
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
...
am: c8ad4a82c7
2017-09-19 23:55:48 +00:00
Jordan Liu
c8ad4a82c7
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
2017-09-19 23:39:42 +00:00
Fyodor Kupolov
80e87f97c3
Merge "Fix AddAccountSettings memory leak" am: 104501fa29
...
am: c17b4e5a14
2017-09-19 18:48:54 +00:00
Fyodor Kupolov
c17b4e5a14
Merge "Fix AddAccountSettings memory leak"
...
am: 104501fa29
2017-09-19 18:42:07 +00:00
Fyodor Kupolov
104501fa29
Merge "Fix AddAccountSettings memory leak"
2017-09-19 18:29:14 +00:00
Tyler Gunn
c26e534bef
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am: 99d28ebbda
...
am: 8b2e421025
2017-09-19 16:44:26 +00:00
Tyler Gunn
8b2e421025
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
...
am: 99d28ebbda
2017-09-19 16:37:38 +00:00
Tyler Gunn
99d28ebbda
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
2017-09-19 16:28:52 +00:00
Neil Fuller
782a79f47a
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 cd1a109b87
2017-09-19 17:10:46 +01:00
Nicolas Geoffray
836f2fe701
Merge "Special handling of priv-apps in Zygote." am: 46af70cad9
...
am: 79d4ef6caa
2017-09-19 12:03:38 +00:00
Nicolas Geoffray
79d4ef6caa
Merge "Special handling of priv-apps in Zygote."
...
am: 46af70cad9
2017-09-19 11:56:05 +00:00
Nicolas Geoffray
46af70cad9
Merge "Special handling of priv-apps in Zygote."
2017-09-19 11:47:58 +00:00
Charles He
a9f6384b6a
Merge changes from topic "vpn-dialog" am: 19bb1a0b99
...
am: 7e75870d11
2017-09-19 08:17:05 +00:00
Charles He
7e75870d11
Merge changes from topic "vpn-dialog"
...
am: 19bb1a0b99
2017-09-19 08:09:45 +00:00
Charles He
01014743c0
Merge changes from topic "always-on-vpn" am: cc15c7f8c1
...
am: 692b55390f
2017-09-19 08:09:41 +00:00
Charles He
692b55390f
Merge changes from topic "always-on-vpn"
...
am: cc15c7f8c1
2017-09-19 08:01:45 +00:00
Charles He
19bb1a0b99
Merge changes from topic "vpn-dialog"
...
* changes:
Unbreak VPN unit tests.
Add alert dialog when always-on VPN disconnects.
2017-09-19 07:56:44 +00:00
Charles He
c17f50f83d
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 3da6a1fc82
2017-09-19 07:56:36 +00:00
Charles He
cc15c7f8c1
Merge changes from topic "always-on-vpn"
...
* changes:
Opt-out for always-on VPN: rename API.
Opt-out for always-on VPN
2017-09-19 07:50:13 +00:00
Hugo Benichi
19625788a1
Merge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab
...
am: a35bbadeba
2017-09-19 07:29:09 +00:00
Hugo Benichi
a35bbadeba
Merge "Wakeup packet events: addressing a few comments"
...
am: 67d16ec1ab
2017-09-19 07:21:12 +00:00
Hugo Benichi
67d16ec1ab
Merge "Wakeup packet events: addressing a few comments"
2017-09-19 07:12:03 +00:00
Rubin Xu
3db86833e6
Merge "Fix LinkPropertiesTest.testCompareResult" am: 430d8472b2
...
am: 082234f4aa
2017-09-19 06:45:04 +00:00
Rubin Xu
082234f4aa
Merge "Fix LinkPropertiesTest.testCompareResult"
...
am: 430d8472b2
2017-09-19 06:37:40 +00:00
Treehugger Robot
430d8472b2
Merge "Fix LinkPropertiesTest.testCompareResult"
2017-09-19 06:28:21 +00:00
Hugo Benichi
175b574e27
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
2017-09-19 14:07:47 +09:00
Steven Moreland
0fcb7719e0
Merge "Remove unused variable from screencap." am: 376234fc74
...
am: 32bdb1e9b0
2017-09-19 03:29:20 +00:00
Steven Moreland
32bdb1e9b0
Merge "Remove unused variable from screencap."
...
am: 376234fc74
2017-09-19 03:22:42 +00:00
Treehugger Robot
376234fc74
Merge "Remove unused variable from screencap."
2017-09-19 03:12:18 +00:00
Pengquan Meng
b3bc234dfa
Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89
...
am: 74bd3daaac
2017-09-19 01:31:24 +00:00
Pengquan Meng
74bd3daaac
Merge "Incorrect decoding when TP-OA contains non-integer information"
...
am: 2bcc7fac89
2017-09-19 01:23:53 +00:00
Pengquan Meng
2bcc7fac89
Merge "Incorrect decoding when TP-OA contains non-integer information"
2017-09-19 01:14:34 +00:00
Erika Avenberg
0be6d7cbd8
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
2017-09-18 15:21:08 -07:00
Bill Yi
728b23a934
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours
...
am: 60af01bec9
2017-09-18 20:16:41 +00:00
Bill Yi
60af01bec9
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 69ca32dcea
2017-09-18 20:07:14 +00:00
Bill Yi
d65cbc4442
Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours am: 456c147827 -s ours
...
am: c49cdb6749
2017-09-18 20:05:45 +00:00
Bill Yi
c49cdb6749
Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours
...
am: 456c147827
2017-09-18 19:56:59 +00:00
TreeHugger Robot
69ca32dcea
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-09-18 19:31:18 +00:00
Bill Yi
456c147827
Import translations. DO NOT MERGE am: 791ebeed32 -s ours
...
am: fee3748d04
2017-09-18 19:16:08 +00:00
Bill Yi
fee3748d04
Import translations. DO NOT MERGE
...
am: 791ebeed32
2017-09-18 19:09:21 +00:00
Julia Reynolds
b35af33888
Merge "Fix nomanservice notificationrecord leak" into oc-dev am: 9c32669043 -s ours
...
am: beb14f16fd
2017-09-18 18:16:38 +00:00
Julia Reynolds
beb14f16fd
Merge "Fix nomanservice notificationrecord leak" into oc-dev
...
am: 9c32669043
2017-09-18 18:09:02 +00:00
fionaxu
1a7379d788
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev
...
am: 6e40562a73
2017-09-18 18:06:26 +00:00
Ruina Liu
311d031d22
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44
...
am: 8c65620d31
2017-09-18 18:00:58 +00:00
fionaxu
6e40562a73
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
Bug: 65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
2017-09-18 17:57:45 +00:00
Ruina Liu
8c65620d31
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
...
am: ac421b8f44
2017-09-18 17:53:31 +00:00
