Commit Graph

333342 Commits

Author SHA1 Message Date
Jason Monk
f7aeee2ca5 Merge "Fix random systemui crashes during boot" am: 8078996f4a -s ours
am: 7b4087acdb

Change-Id: Ib5f08316a5ae559fe8fab09601607e523bd32793
2017-09-20 17:00:20 +00:00
Eric Laurent
0c4a9d2714 AudioService: reduce EU volume warning thresdhold for USB headsets
am: 630f37a4ad

Change-Id: Ib9a3ebae93073018fc4bda0d2dc36c5fc1fdac92
2017-09-20 16:54:43 +00:00
Jason Monk
7b4087acdb Merge "Fix random systemui crashes during boot"
am: 8078996f4a  -s ours

Change-Id: I97b1d904c2e37aff4ade169d0f76d7f0d123fc5b
2017-09-20 16:53:13 +00:00
Neil Fuller
93fcfbc8cb resolve merge conflicts of 83c367aa5b to stage-aosp-master
am: 8acdb8aa65

Change-Id: I7605323c886c9dafb83899c8b78e2bb860f96bb4
2017-09-20 14:55:08 +00:00
Jason Monk
8078996f4a Merge "Fix random systemui crashes during boot" 2017-09-20 13:50:45 +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

Change-Id: If8b12685886ccbdecdb4e123629edc4e3426711d
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

Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17
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

Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee
2017-09-19 18:48:54 +00:00
Fyodor Kupolov
c17b4e5a14 Merge "Fix AddAccountSettings memory leak"
am: 104501fa29

Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86
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

Change-Id: I2b73595add333660c2a4b62538334b8cb38ac9cb
2017-09-19 16:44:26 +00:00
Tyler Gunn
8b2e421025 Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
am: 99d28ebbda

Change-Id: I99ff94901868d3b16a20a6592e106bc0645b863e
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
Eric Laurent
630f37a4ad 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 0e5deb3967)
2017-09-19 16:11:24 +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

Change-Id: Ice349c6b6160ad89ba1c8543acf3e678a1473a25
2017-09-19 12:03:38 +00:00
Nicolas Geoffray
79d4ef6caa Merge "Special handling of priv-apps in Zygote."
am: 46af70cad9

Change-Id: I1dbf2313c9ee1c014854630eac5f1429548ae7f6
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

Change-Id: Ifb581e7b40d52b2378b347ff62669713be344093
2017-09-19 08:17:05 +00:00
Charles He
7e75870d11 Merge changes from topic "vpn-dialog"
am: 19bb1a0b99

Change-Id: I168072aa2bfdb9ed7630cf50547cb9732fb29280
2017-09-19 08:09:45 +00:00
Charles He
01014743c0 Merge changes from topic "always-on-vpn" am: cc15c7f8c1
am: 692b55390f

Change-Id: I3931c053c4daff092b06e3e1d673817708762a62
2017-09-19 08:09:41 +00:00
Charles He
692b55390f Merge changes from topic "always-on-vpn"
am: cc15c7f8c1

Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
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

Change-Id: I33eeb421cff21efdaa409d27fb130ff4754ac6b0
2017-09-19 07:29:09 +00:00
Hugo Benichi
a35bbadeba Merge "Wakeup packet events: addressing a few comments"
am: 67d16ec1ab

Change-Id: I67b2e54d45a39005e2091a46e8b90d8cc75fe079
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

Change-Id: Iedfbc9a6505611d1a30c348ab15f4fb5b62238eb
2017-09-19 06:45:04 +00:00
Rubin Xu
082234f4aa Merge "Fix LinkPropertiesTest.testCompareResult"
am: 430d8472b2

Change-Id: If87f8c43371ee1f5e2e893232c9e340a1a7339f4
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

Change-Id: If4c2b39333270982975feb1745b3bbaaa3a177b8
2017-09-19 03:29:20 +00:00
Steven Moreland
32bdb1e9b0 Merge "Remove unused variable from screencap."
am: 376234fc74

Change-Id: I5afb38c24ab6924925ab2852c5fe0ef29a91a2ff
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

Change-Id: Idc00a34295cdcbefa19636643bff3c3bf2323446
2017-09-19 01:31:24 +00:00
Pengquan Meng
74bd3daaac Merge "Incorrect decoding when TP-OA contains non-integer information"
am: 2bcc7fac89

Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
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  -s ours

Change-Id: I920bb3060556824d8185701b10ea71828e242591
2017-09-18 20:16:41 +00:00
Bill Yi
60af01bec9 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 69ca32dcea  -s ours

Change-Id: I59c5213db2534724e11d0eadf049d9d5489ffa18
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  -s ours

Change-Id: Ief5061ef3933b7e1447e235923a52d741fc8fa7e
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  -s ours

Change-Id: I029764bb19cc295e4749d8974461f6d6be23d5c2
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  -s ours

Change-Id: I4d666020e912f122850cc140e3f62d65aea029ca
2017-09-18 19:16:08 +00:00
Bill Yi
fee3748d04 Import translations. DO NOT MERGE
am: 791ebeed32  -s ours

Change-Id: Iff6d60fe8fd1444c88ffa76634a50a4bb377334d
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

Change-Id: I4389c9502a6b8dd0224ec4323bbbe2599133de15
2017-09-18 18:16:38 +00:00