OSDN Git Service
Peng Xu [Tue, 26 Sep 2017 12:13:04 +0000 (12:13 +0000)]
Merge changes from topic "equalizer" am:
aad139a2d3 -s ours
am:
2c292120aa -s ours
Change-Id: I7d40f3964fd312fe645dba2b05cc324fea079321
Peng Xu [Tue, 26 Sep 2017 11:56:01 +0000 (11:56 +0000)]
Update Java doc of SensorManager.createDirectChannel am:
9ee042efa8
am:
1c2b555ad9
Change-Id: If2ca73b4b7ba4c1e6778061739ce3689a1341746
Peng Xu [Tue, 26 Sep 2017 11:01:14 +0000 (11:01 +0000)]
Merge changes from topic "equalizer"
am:
aad139a2d3 -s ours
Change-Id: Id283ea5e7ad3620f9c6488aadcca8bb216aea482
Peng Xu [Mon, 25 Sep 2017 23:03:30 +0000 (23:03 +0000)]
Update Java doc of SensorManager.createDirectChannel
am:
9ee042efa8
Change-Id: I7221311f8b9495381e75362c8d2b962761bf7645
Peng Xu [Sat, 23 Sep 2017 00:17:10 +0000 (00:17 +0000)]
Merge changes from topic "equalizer"
* changes:
Update Java doc of SensorManager.createDirectChannel
sensors: pass sensor handle along with injected event
Myles Watson [Fri, 22 Sep 2017 18:06:47 +0000 (18:06 +0000)]
Merge changes from topic "avrcp_cherry_picks" am:
b4e17814f0
am:
898bc38860
Change-Id: Iee7beb952d58e7c117fa2fc50537988c7ad8b443
Ajay Panicker [Fri, 22 Sep 2017 18:05:41 +0000 (18:05 +0000)]
Add equal overloads to some MediaDescription and MediaQueue objects (2/3) am:
905d8ab843
am:
12bec46613
Change-Id: I88f9d4c23f4757fe50bbb36ef376e7460a28f1ca
Myles Watson [Fri, 22 Sep 2017 17:15:58 +0000 (17:15 +0000)]
Merge changes from topic "avrcp_cherry_picks"
am:
b4e17814f0
Change-Id: Id15dddaeb7082031fdd03ca9e0f9f54c83abb142
Ajay Panicker [Fri, 22 Sep 2017 17:14:36 +0000 (17:14 +0000)]
Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
am:
905d8ab843
Change-Id: I8f47786d4e0c392b008cdce80aed05ca7b1573b1
Myles Watson [Fri, 22 Sep 2017 16:37:33 +0000 (16:37 +0000)]
Merge changes from topic "avrcp_cherry_picks"
* changes:
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (1/2)
Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
Ajay Panicker [Fri, 1 Sep 2017 18:58:38 +0000 (11:58 -0700)]
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (1/2)
This is requied for the 2012 Mazda 3 carkit as the carkit refuses to send
AVRCP commands other than passthrough commands when the version is anything
else. AVRCP 1.3 is compatible with most carkits on the market and can be
used to get most carkits working at the cost of losing many features.
Bug:
37943083
Test: Set AVRCP 1.3 in developer options and see that SDP and the AVRCP
capabilites have updated to reflect this.
TestTracker: 105915/3975
Change-Id: I637b695e5cd8baa5f054ca0dda81372080a96269
Ajay Panicker [Fri, 21 Jul 2017 20:29:57 +0000 (13:29 -0700)]
Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
Bug:
64686424
Test: Connect to carkit and see that NowPlayingChanged only gets sent when
the queue changes, run cts test
Change-Id: I58c9dd0bf976485a2efefd042cd667ee433e07e1
(cherry picked from commit
6edb68bea68d5f324384f3e9e411118eb8dfc781)
Christopher Schuster [Fri, 22 Sep 2017 15:11:08 +0000 (15:11 +0000)]
Merge "fixed handling of data URI schemes in Intent.toUri" am:
c3d3cf5666
am:
928b7cba47
Change-Id: I1c41d3eb7ac815b8cf04879fbeee70a66d5a2a3e
Christopher Schuster [Fri, 22 Sep 2017 15:02:03 +0000 (15:02 +0000)]
Merge "fixed handling of data URI schemes in Intent.toUri"
am:
c3d3cf5666
Change-Id: Id4b8ef16f7a428e6c3d8b382387cf575d05926ad
Treehugger Robot [Fri, 22 Sep 2017 09:04:16 +0000 (09:04 +0000)]
Merge "fixed handling of data URI schemes in Intent.toUri"
Takamasa Kuramitsu [Fri, 22 Sep 2017 02:43:24 +0000 (02:43 +0000)]
Merge "Add checking values not to save illegal value to appwidgets.xml" am:
941d4b2135
am:
1807cb4a88
Change-Id: I6e02c6dead092e8727f8ef76eaf689ef0cfec376
Takamasa Kuramitsu [Fri, 22 Sep 2017 02:37:24 +0000 (02:37 +0000)]
Merge "Add checking values not to save illegal value to appwidgets.xml"
am:
941d4b2135
Change-Id: I4d74a5deb0a48e4b61dcfacb3f19f735afe5d95e
Treehugger Robot [Fri, 22 Sep 2017 02:17:47 +0000 (02:17 +0000)]
Merge "Add checking values not to save illegal value to appwidgets.xml"
Andre Eisenbach [Thu, 21 Sep 2017 21:52:39 +0000 (21:52 +0000)]
Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev am:
5c54a732f1
am:
60315cab7a
Change-Id: I88d00765cd8e9a3f8b31135f3b63f9a25012dac1
Andre Eisenbach [Thu, 21 Sep 2017 21:40:45 +0000 (21:40 +0000)]
Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev
am:
5c54a732f1
Change-Id: I62bacf450c64f98e44e15e0a1ec7a4f13f2982c4
Andre Eisenbach [Thu, 21 Sep 2017 18:15:27 +0000 (18:15 +0000)]
Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev
Bill Yi [Thu, 21 Sep 2017 16:19:42 +0000 (16:19 +0000)]
Import translations. DO NOT MERGE am:
de5eefa935 -s ours am:
9d008286c7 -s ours am:
b4e9b3f651 -s ours
am:
7139a4dd5e -s ours
Change-Id: I9a8c5a42038743f46b46b26b26d383799a102bde
Bill Yi [Thu, 21 Sep 2017 16:13:13 +0000 (16:13 +0000)]
Import translations. DO NOT MERGE am:
de5eefa935 -s ours am:
9d008286c7 -s ours
am:
b4e9b3f651 -s ours
Change-Id: I8b727efb19b68f7adfc1f3eda4240e70551b8102
Bill Yi [Thu, 21 Sep 2017 16:11:12 +0000 (16:11 +0000)]
Import translations. DO NOT MERGE am:
50e19c566e -s ours
am:
e708378dc9 -s ours
Change-Id: Iddd08f8c762a19e7785f0fc067154f246553e2ff
Bill Yi [Thu, 21 Sep 2017 16:06:29 +0000 (16:06 +0000)]
Import translations. DO NOT MERGE
am:
50e19c566e -s ours
Change-Id: I82b5f21b00ed2e75a74859ffe70560e6999902a6
Bill Yi [Thu, 21 Sep 2017 16:04:11 +0000 (16:04 +0000)]
Import translations. DO NOT MERGE am:
de5eefa935 -s ours
am:
9d008286c7 -s ours
Change-Id: I5535968d3817e8c09e9d5e3e0a75180d29dbe303
Bill Yi [Thu, 21 Sep 2017 15:56:53 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
de5eefa935 -s ours
Change-Id: I53abfc53a067bca1cec279285f59185b8b18a64e
Christopher Schuster [Fri, 21 Jul 2017 21:53:52 +0000 (14:53 -0700)]
fixed handling of data URI schemes in Intent.toUri
Data URIs in intents can use schemes with digits and some special
characters (see RFC 2396 and 3986). This patch fixes how these
data URIs are handled by Intent.toUri to support these schemes.
Bug:
63930680
Test: run cts android.content.cts.IntentTest#testUris
Change-Id: I0dbb72325f59f372abba83be9e14c59d5665a053
Signed-off-by: Christopher Schuster <levjj@google.com>
vichang [Thu, 21 Sep 2017 12:53:54 +0000 (12:53 +0000)]
Merge "Remove StructGroupSourceReq" am:
c7d27845df
am:
4c86c99273
Change-Id: I7bf2fbedce07a63adb16cff7c8a2febf90b606f7
vichang [Thu, 21 Sep 2017 12:47:34 +0000 (12:47 +0000)]
Merge "Remove StructGroupSourceReq"
am:
c7d27845df
Change-Id: I73bc8a380f8981cff14a4ef5c6f36f81a8b4d7f8
vichang [Thu, 21 Sep 2017 12:42:15 +0000 (12:42 +0000)]
Merge "Remove StructGroupSourceReq"
Hugo Benichi [Thu, 21 Sep 2017 12:14:37 +0000 (12:14 +0000)]
Merge "Implement ConnectivityService TODO and fix many race conditions" am:
f6b72dd145
am:
8bb2cdea00
Change-Id: I4a7658e1fa6946063ab86a251269413903841ee8
Hugo Benichi [Thu, 21 Sep 2017 12:08:45 +0000 (12:08 +0000)]
Merge "Implement ConnectivityService TODO and fix many race conditions"
am:
f6b72dd145
Change-Id: I2011e23c9f894c079ab66cd7cc5c14af572a956d
Erik Kline [Thu, 21 Sep 2017 12:02:07 +0000 (12:02 +0000)]
Merge "Also support 464xlat on SUSPENDED networks" am:
995a28d334
am:
69a28066bd
Change-Id: I960a8976abfebc6741a5982c749c8e428a675990
Hugo Benichi [Thu, 21 Sep 2017 12:00:48 +0000 (12:00 +0000)]
Merge "Implement ConnectivityService TODO and fix many race conditions"
Erik Kline [Thu, 21 Sep 2017 11:55:35 +0000 (11:55 +0000)]
Merge "Also support 464xlat on SUSPENDED networks"
am:
995a28d334
Change-Id: Iab87bfcb66e7932d61beec38bcbda366262eab46
Treehugger Robot [Thu, 21 Sep 2017 11:47:33 +0000 (11:47 +0000)]
Merge "Also support 464xlat on SUSPENDED networks"
Bill Yi [Thu, 21 Sep 2017 10:12:01 +0000 (03:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I0e4df67a950b6e0d541548c01f0812141102fb91
Hugo Benichi [Wed, 20 Sep 2017 02:20:14 +0000 (11:20 +0900)]
Implement ConnectivityService TODO and fix many race conditions
This patch implements an outstanding TODO in ConnectivityService to add
synchronization over the map of network request ids to network agent
info objects.
This structure is accessed from multiple threads:
- Binder thread on public aidl methods, most notably via
getDefaultNetwork().
- Internal handler.
This leads to many race conditions that can crash the system server and
reboot the phone if getDefaultNetwork() is called on a Binder thread to
service a public ConnectivityManager api while the default network state
is being updated on the internal handler after losing the default
network.
Bug:
65911184
Test: runtest frameworks-net
Change-Id: I86c830ebd559e31d4576a7606705a056afb064ac
Erik Kline [Thu, 21 Sep 2017 08:28:10 +0000 (17:28 +0900)]
Also support 464xlat on SUSPENDED networks
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
65684232
Change-Id: I1b10aab01554b1f926ec7157dba78645fdaff90f
Erik Kline [Thu, 21 Sep 2017 08:52:53 +0000 (08:52 +0000)]
Merge "have OffloaderController store and re-push more state" am:
69efc596af
am:
7a5dd80c95
Change-Id: Ic6d1c57b21bca6dc91f7c24a0fcbe11619364e57
Erik Kline [Thu, 21 Sep 2017 08:47:43 +0000 (08:47 +0000)]
Merge "have OffloaderController store and re-push more state"
am:
69efc596af
Change-Id: I468b9d774bb273c765ee6ff597ff207d047e1cc6
Treehugger Robot [Thu, 21 Sep 2017 08:35:44 +0000 (08:35 +0000)]
Merge "have OffloaderController store and re-push more state"
Erik Kline [Tue, 19 Sep 2017 08:56:10 +0000 (17:56 +0900)]
have OffloaderController store and re-push more state
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
64976634
Merged-In: If3a859736a1b3730e4e3d0d2685f3e5432927796
Merged-In: If9afc160fa2f8b5da66cb0a6a35dfcb4f1839d36
Change-Id: Ib1421438a1e748722fc41f1fbfb01ada187bb1c8
(cherry picked from commit
7334b0e2cc5ec7f8803c463a1e674cceb7e4c3ba)
Bill Yi [Thu, 21 Sep 2017 03:12:47 +0000 (20:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6f78b65137e2f7cd0e64ddc2bcdb7e2aa32817c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Peng Xu [Wed, 5 Jul 2017 22:21:12 +0000 (15:21 -0700)]
Update Java doc of SensorManager.createDirectChannel
Java doc was left out when addressing API reviewer comments.
This CL fix the discrepancy between the actual logic and java doc.
Bug:
36550285
Test: compiles
Change-Id: I6406892ecdcc5d02f11966fa3fb0b81ed8d3b285
Merged-In: I6406892ecdcc5d02f11966fa3fb0b81ed8d3b285
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."
Alexey Polyudov [Wed, 24 May 2017 02:54:26 +0000 (19:54 -0700)]
sensors: pass sensor handle along with injected event
Change-Id: I5e8eacfa940c082a14a9876f455c55b84b975086
Merged-In: I5e8eacfa940c082a14a9876f455c55b84b975086
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"
Victor Chang [Fri, 11 Aug 2017 16:17:16 +0000 (17:17 +0100)]
Remove StructGroupSourceReq
- Remove the class as part of removing setsockoptGroupSourceReq from
Os.java
- CtsLibcoreTestCases and CtsLibcoreOjTestCases pass on aosp/master
Bug:
32071916
Test: cts-tradefed run cts-dev --module CtsLibcoreTestCases
Test: cts-tradefed run cts-dev --module CtsLibcoreOjTestCases
Merged-In: I132190f47cea9f56ec56a824763f7e2b2cfde893
Change-Id: I132190f47cea9f56ec56a824763f7e2b2cfde893
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
Takamasa Kuramitsu [Mon, 18 Sep 2017 01:49:41 +0000 (10:49 +0900)]
Add checking values not to save illegal value to appwidgets.xml
Symptom:
All AppWidgets on Home screen disppear after appwidgets.xml updated
with invalid value.
Root cause:
The issue occurs when size information of an AppWidget is set to 0
via AppWidgetHostView#updateAppWidgetSize() API.
Since width and height are taken positive padding, so they become
negative number and are sent to
AppWidgetServiceImpl#updateAppWidgetOptions().
In updateAppWidgetOptions(), convert values by
Integer.toHexString() to save widget parameters to appwidgets.xml,
but negative numbers become illegal values for Integer.parseInt().
After device is rebooted, widgets cannot be reloaded because parsing
appwidgets.xml fail by NumberFormatException at Integer.parseInt().
Solution:
When writing the widget's info to appwidgets.xml, check the size
parameters and replace with 0 if they're negative value.
Bug:
65705916
Change-Id: I48f69fbf081201a176ea1093094ba6cdb120e5f5
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