OSDN Git Service
Kurt Nelson [Tue, 19 Sep 2017 19:26:02 +0000 (12:26 -0700)]
Make StrictMode constants visible for testing
All detector bits should be the same visibility.
Extract some error messages into constants.
Bug:
65966451
Test: CTS builds
Change-Id: Ib8ed80042c8d490d18ddd0054db8870e09c2b19d
TreeHugger Robot [Tue, 19 Sep 2017 19:34:34 +0000 (19:34 +0000)]
Merge "Fix navbar colors on power menu"
Fyodor Kupolov [Tue, 19 Sep 2017 19:04:36 +0000 (19:04 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29 am:
c17b4e5a14 am:
80e87f97c3
am:
c9117ddbfa
Change-Id: I6e565af0ec462e57ae38f0c4f09b8c52bb5c6ab4
Fyodor Kupolov [Tue, 19 Sep 2017 18:56:45 +0000 (18:56 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29 am:
c17b4e5a14
am:
80e87f97c3
Change-Id: Iff2f6a0dff9774d155961aafade36eeb5db5bc81
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
TreeHugger Robot [Tue, 19 Sep 2017 18:38:45 +0000 (18:38 +0000)]
Merge "Sysui doesn't have a bp, it has an mk..."
Fyodor Kupolov [Tue, 19 Sep 2017 18:29:14 +0000 (18:29 +0000)]
Merge "Fix AddAccountSettings memory leak"
David Stevens [Tue, 19 Sep 2017 18:13:46 +0000 (18:13 +0000)]
Merge "Handle showWhenLocked on secondary displays"
TreeHugger Robot [Tue, 19 Sep 2017 18:00:20 +0000 (18:00 +0000)]
Merge "Fix VectorDrawable dirty flag logic"
Tyler Gunn [Tue, 19 Sep 2017 17:05:49 +0000 (17:05 +0000)]
Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025 am:
c26e534bef" into oc-mr1-dev-plus-aosp
am:
dfcd7852a2
Change-Id: Iff9efc0b5dbb0593592f95db5924d045cc68d8e1
Fyodor Kupolov [Tue, 19 Sep 2017 17:01:11 +0000 (17:01 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev am:
14b86be8da
am:
48a272464c
Change-Id: I46e7494178f86e56faa214cca709fd360659cb73
Android Build Merger (Role) [Tue, 19 Sep 2017 16:56:47 +0000 (16:56 +0000)]
Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025 am:
c26e534bef" into oc-mr1-dev-plus-aosp
Tyler Gunn [Tue, 19 Sep 2017 16:52:09 +0000 (16:52 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025
am:
c26e534bef
Change-Id: I447794014fe74f6efb4c712808704b8b0f8bc43f
David Stevens [Tue, 19 Sep 2017 16:51:58 +0000 (16:51 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev am:
71267deb18
am:
2f5c306b82
Change-Id: I5dba0293e924890977f5ce2333152dffdd8132ee
Fyodor Kupolov [Tue, 19 Sep 2017 16:51:50 +0000 (16:51 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev
am:
14b86be8da
Change-Id: I7902b082d55063a902576b300295a771b64238b4
Fyodor Kupolov [Tue, 19 Sep 2017 16:45:39 +0000 (16:45 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev
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
David Stevens [Tue, 19 Sep 2017 16:44:05 +0000 (16:44 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev
am:
71267deb18
Change-Id: I8c84eed94013f07e1c0eabe020cd4e8eeee1f7ba
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
David Stevens [Tue, 19 Sep 2017 16:35:28 +0000 (16:35 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev
Tyler Gunn [Tue, 19 Sep 2017 16:28:52 +0000 (16:28 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
TreeHugger Robot [Tue, 19 Sep 2017 15:36:52 +0000 (15:36 +0000)]
Merge "Fix reliability triggering"
TreeHugger Robot [Tue, 19 Sep 2017 14:36:52 +0000 (14:36 +0000)]
Merge "Improve WMP dumpsys readability."
Stan Iliev [Thu, 14 Sep 2017 14:58:26 +0000 (10:58 -0400)]
Fix VectorDrawable dirty flag logic
Pass VD staging dirty flag value to the render thread dirty flag.
This is fixing animation on growing VD bounds, which looked bad
because cache was not refreshed and scaling it up 100 times did
not look good.
Test: Ran GoogleCamera app and HWUI unit tests.
Bug:
65534766
Change-Id: Ie83cbb6839c772556340b4ec526ba3699fc84255
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
Jason Monk [Tue, 19 Sep 2017 13:25:35 +0000 (09:25 -0400)]
Sysui doesn't have a bp, it has an mk...
Test: none
Change-Id: I8e2516f5bfc4ba4e53c240a977b6939f834cb319
TreeHugger Robot [Tue, 19 Sep 2017 12:58:32 +0000 (12:58 +0000)]
Merge "[RefactoredBMS] Use buffered DataInputStream vs RandomAccessFile"
Joachim Sauer [Tue, 19 Sep 2017 12:54:59 +0000 (12:54 +0000)]
Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev am:
61faffd75b
am:
101c0258cc
Change-Id: I4eb02e0ebc0132f8d434c51fe53cc648d8310293
Joachim Sauer [Tue, 19 Sep 2017 12:45:27 +0000 (12:45 +0000)]
Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev
am:
61faffd75b
Change-Id: I58020aa141a55750059a57063cea30bcc706e908
Joachim Sauer [Tue, 19 Sep 2017 12:39:01 +0000 (12:39 +0000)]
Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev
Android Build Merger (Role) [Tue, 19 Sep 2017 12:21:59 +0000 (12:21 +0000)]
Merge "Merge "Special handling of priv-apps in Zygote." am:
46af70cad9 am:
79d4ef6caa am:
836f2fe701 am:
0bd07225e7"
Nicolas Geoffray [Tue, 19 Sep 2017 12:19:26 +0000 (12:19 +0000)]
Merge "Special handling of priv-apps in Zygote." am:
46af70cad9 am:
79d4ef6caa am:
836f2fe701
am:
0bd07225e7
Change-Id: I21e4726a7e76a4d595cd819d64b2fcc1aa2dfd6d
Nicolas Geoffray [Tue, 19 Sep 2017 12:11:51 +0000 (12:11 +0000)]
Merge "Special handling of priv-apps in Zygote." am:
46af70cad9 am:
79d4ef6caa
am:
836f2fe701
Change-Id: Ieb8b53e69ac14be6e4e0e0210f12343e7e863b66
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."
Michal Karpinski [Tue, 19 Sep 2017 10:35:59 +0000 (11:35 +0100)]
[RefactoredBMS] Use buffered DataInputStream vs RandomAccessFile
This CL replicates ag/
2239004 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: Id83445d433987730c5cdf9b9684b647baf3c3d1b
Michal Karpinski [Tue, 19 Sep 2017 10:07:58 +0000 (11:07 +0100)]
[RefactoredBMS] Refresh in-memory SharedPreferences instances after restore
This CL replicates ag/
2284557 in RefactoredBMS (only the BMS part, the
rest is already live code).
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: I4f6cb85b879e0ee7b2b20ac998977f8c6d8fdfe0
Michal Karpinski [Tue, 19 Sep 2017 09:46:38 +0000 (10:46 +0100)]
[RefactoredBMS] Tear down agent after preflight rejection
This CL replicates ag/
2520584 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: I13ac110dbc197df473dd6a0cf24866133dfefab8
Michal Karpinski [Tue, 19 Sep 2017 09:34:07 +0000 (10:34 +0100)]
[RefactoredBMS] Do not perform backup/restore of instant apps
This CL replicates ag/
2256021 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: Icf615b97025aa09681f9d25b1de3f94e60a45ee4
Charles He [Tue, 19 Sep 2017 08:32:46 +0000 (08:32 +0000)]
Merge changes from topic "vpn-dialog" am:
19bb1a0b99 am:
7e75870d11 am:
a9f6384b6a
am:
27e007a58d
Change-Id: I1c3a3b852bd12a4310f54027b0e893feae2e0d55
Charles He [Tue, 19 Sep 2017 08:25:22 +0000 (08:25 +0000)]
Merge changes from topic "always-on-vpn" am:
cc15c7f8c1 am:
692b55390f am:
01014743c0
am:
551fb6ba84
Change-Id: Id3ac9d9e2a982e9205f4f4a70c1373eed6480844
Charles He [Tue, 19 Sep 2017 08:25:16 +0000 (08:25 +0000)]
Merge changes from topic "vpn-dialog" am:
19bb1a0b99 am:
7e75870d11
am:
a9f6384b6a
Change-Id: I853f48a75865008ac8b976eec1af56fb1870a1b3
Charles He [Tue, 19 Sep 2017 08:17:12 +0000 (08:17 +0000)]
Merge changes from topic "always-on-vpn" am:
cc15c7f8c1 am:
692b55390f
am:
01014743c0
Change-Id: Ide329f8e32538f4643e727697b35bfc2b7007f57
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
TreeHugger Robot [Tue, 19 Sep 2017 08:14:55 +0000 (08:14 +0000)]
Merge "Translate Android log entries to stats_log proto Test: tested on local device"
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:42:18 +0000 (07:42 +0000)]
Merge "Wakeup packet events: addressing a few comments" am:
67d16ec1ab am:
a35bbadeba am:
19625788a1
am:
98177f01f7
Change-Id: I7d57c0f2377f44bcf75e18c80c0306bbfccb9591
Hugo Benichi [Tue, 19 Sep 2017 07:36:12 +0000 (07:36 +0000)]
Merge "Wakeup packet events: addressing a few comments" am:
67d16ec1ab am:
a35bbadeba
am:
19625788a1
Change-Id: I8ca2a01a95acaaca2599563efd6a21e4372d1f95
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:57:14 +0000 (06:57 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am:
430d8472b2 am:
082234f4aa am:
3db86833e6
am:
1aabcf76ef
Change-Id: Ie928474dc005c713063885d156786106ca2c281c
Rubin Xu [Tue, 19 Sep 2017 06:51:07 +0000 (06:51 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am:
430d8472b2 am:
082234f4aa
am:
3db86833e6
Change-Id: I72b0ca1b9b50dacb7067eb6ca12ca48a072b5d26
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
yro [Fri, 15 Sep 2017 17:06:40 +0000 (10:06 -0700)]
Translate Android log entries to stats_log proto
Test: tested on local device
Change-Id: If9a779a96d31cefaffb1e4424629c14b08e1fc57
Treehugger Robot [Tue, 19 Sep 2017 06:28:21 +0000 (06:28 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
Jeff Sharkey [Tue, 19 Sep 2017 05:11:14 +0000 (05:11 +0000)]
Merge "Destroy vold socket interface completely."
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:40:31 +0000 (03:40 +0000)]
Merge "Remove unused variable from screencap." am:
376234fc74 am:
32bdb1e9b0 am:
0fcb7719e0
am:
2aea4cae01
Change-Id: I2eb8b57458721a1b78766552cb5a12c284b291e7
Steven Moreland [Tue, 19 Sep 2017 03:35:00 +0000 (03:35 +0000)]
Merge "Remove unused variable from screencap." am:
376234fc74 am:
32bdb1e9b0
am:
0fcb7719e0
Change-Id: I6aebd6df0bf9734e1567db31d31bfe85609cbb48
Matthew Ng [Tue, 19 Sep 2017 03:32:47 +0000 (03:32 +0000)]
Merge "Set use low res snapshots for low ram devices missing in theme snapshot" into oc-mr1-dev am:
745388d5aa
am:
5b3e2174b2
Change-Id: I82b83dbc1846eb2a53a14b8d6fd4822d4496c02c
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
Matthew Ng [Tue, 19 Sep 2017 03:24:28 +0000 (03:24 +0000)]
Merge "Set use low res snapshots for low ram devices missing in theme snapshot" into oc-mr1-dev
am:
745388d5aa
Change-Id: I3ced2443d28b3e62c29fdb509d582db7b52c5da8
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:15:41 +0000 (03:15 +0000)]
Merge "Set use low res snapshots for low ram devices missing in theme snapshot" into oc-mr1-dev
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:44:24 +0000 (01:44 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information" am:
2bcc7fac89 am:
74bd3daaac am:
b3bc234dfa
am:
f05a01caf3
Change-Id: I817598283a95460cebd6890ddcc44950d630d7c0
Pengquan Meng [Tue, 19 Sep 2017 01:38:10 +0000 (01:38 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information" am:
2bcc7fac89 am:
74bd3daaac
am:
b3bc234dfa
Change-Id: I5df968dbf00665d3bfdd451dc4e03fda055c371a
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
Pawin Vongmasa [Tue, 19 Sep 2017 01:30:01 +0000 (01:30 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev am:
9b1a9b4fb9
am:
729cb8b2b5
Change-Id: If4ab02ad02b39e197b15d3b1b9c9eef6e4a87cdd
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
Pawin Vongmasa [Tue, 19 Sep 2017 01:22:34 +0000 (01:22 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
am:
9b1a9b4fb9
Change-Id: Ibdfb6f003c7467f58c9232d807d52b327e2187af
Pengquan Meng [Tue, 19 Sep 2017 01:14:34 +0000 (01:14 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"
TreeHugger Robot [Tue, 19 Sep 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
Santos Cordon [Tue, 19 Sep 2017 00:55:43 +0000 (00:55 +0000)]
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev am:
f7771c9f77
am:
a17abfef56
Change-Id: Idf89c63e91b0677799b3b48aff3f19fd08792998
Santos Cordon [Tue, 19 Sep 2017 00:47:52 +0000 (00:47 +0000)]
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev
am:
f7771c9f77
Change-Id: Ib569f91269f75ee288dc515505f9a46b0dbe61c9
TreeHugger Robot [Tue, 19 Sep 2017 00:41:04 +0000 (00:41 +0000)]
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev
Bill Yi [Tue, 19 Sep 2017 00:32:31 +0000 (00:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
ae1e26564b -s ours
am:
21310fde50 -s ours
Change-Id: I81ecaa6131fb498660843c9fc9f6c78d6a94ae32
Bill Yi [Tue, 19 Sep 2017 00:26:02 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
ae1e26564b -s ours
Change-Id: I2fff03813084209468b1835d6f2089a4c841fe3c
TreeHugger Robot [Tue, 19 Sep 2017 00:19:44 +0000 (00:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
David Stevens [Thu, 14 Sep 2017 23:27:56 +0000 (16:27 -0700)]
Listen for device power state for VrMode
ActivityManagerService's sleep state is now dependent on whether or not
there are any awake displays, instead of the device power state. Make
VrManagerService listen to the device power state instead of the
ActtivityManagerService sleep state, since its VirtualDisplay for 2D
activities will keep ActtivityManagerService awake.
Bug:
65605913
Test: manual
Change-Id: Ia620d24977d896e6688020d59850046dd0cb7187
TreeHugger Robot [Mon, 18 Sep 2017 23:31:40 +0000 (23:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Matthew Ng [Mon, 18 Sep 2017 23:29:46 +0000 (16:29 -0700)]
Set use low res snapshots for low ram devices missing in theme snapshot
Creating new tasksnapshot from app theme was missing to set the reduced
flag to true.
Test: settings to smart lock and pass pattern/password
Bug:
65534047
Change-Id: I78e9fed223ffc4c7a9cb8d31836b18f1fc4e7d34
Santos Cordon [Mon, 18 Sep 2017 22:49:06 +0000 (22:49 +0000)]
Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev am:
bbd01422d3
am:
211cd1bd3d
Change-Id: I383642287235cdda5cefd4962e24bb74cd7c3041
Felipe Leme [Mon, 18 Sep 2017 22:39:36 +0000 (22:39 +0000)]
Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev am:
e15b1c953f
am:
764df64d3c
Change-Id: Ibb385e4d78e09a193976644854e8da2adc442659
Santos Cordon [Mon, 18 Sep 2017 22:38:36 +0000 (22:38 +0000)]
Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev
am:
bbd01422d3
Change-Id: I41c6869f6514496a5dfc615ef7763f06b6fe1dbd
Felipe Leme [Mon, 18 Sep 2017 22:30:27 +0000 (22:30 +0000)]
Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev
am:
e15b1c953f
Change-Id: Ia5d23edaca925ca762c14071e8bf0556019e6e0c
TreeHugger Robot [Mon, 18 Sep 2017 22:23:58 +0000 (22:23 +0000)]
Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev
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
Eric Laurent [Mon, 18 Sep 2017 22:17:08 +0000 (22:17 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc-mr1-dev am:
64254ff6a4
am:
60392a5fd7
Change-Id: Iaa976b7b8e719595202ee12f33368debcd3cdf47
TreeHugger Robot [Mon, 18 Sep 2017 22:13:31 +0000 (22:13 +0000)]
Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev
Eric Laurent [Mon, 18 Sep 2017 22:09:30 +0000 (22:09 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc-mr1-dev
am:
64254ff6a4
Change-Id: Ie33d6f662fb7ca3f52ed3a71c29d7f2d8c722a8d
OSDN Git Service
