OSDN Git Service
Eino-Ville Talvala [Thu, 21 Sep 2017 21:44:19 +0000 (21:44 +0000)]
Merge "Camera: Add more documentation about thrown exceptions." into oc-mr1-dev
am:
a120e6b604
Change-Id: Ie82286ec2e597affc50ea817e29de9caeac11bb2
TreeHugger Robot [Thu, 21 Sep 2017 19:50:33 +0000 (19:50 +0000)]
Merge "Camera: Add more documentation about thrown exceptions." into oc-mr1-dev
Bill Yi [Thu, 21 Sep 2017 18:51:09 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
20f3c4508c -s ours
Change-Id: Ie8b664833fa4b20844e1fb2b4edd2d8478d399b4
TreeHugger Robot [Thu, 21 Sep 2017 18:42:51 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Felipe Leme [Thu, 21 Sep 2017 17:05:24 +0000 (17:05 +0000)]
Merge "Remove finished sessions on ACTION_CLOSE_SYSTEM_DIALOGS." into oc-mr1-dev
am:
56e5c3944b
Change-Id: I53e1d77508d3d502f31ecc4f907dc0b26fadbf7b
TreeHugger Robot [Thu, 21 Sep 2017 16:54:44 +0000 (16:54 +0000)]
Merge "Remove finished sessions on ACTION_CLOSE_SYSTEM_DIALOGS." into oc-mr1-dev
Winson Chung [Thu, 21 Sep 2017 16:46:20 +0000 (16:46 +0000)]
Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev
am:
66f2d56556
Change-Id: I9145bce7131e695a696e50b3e46e5c4a30a8e669
Winson Chung [Thu, 21 Sep 2017 16:38:16 +0000 (16:38 +0000)]
Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev
Bill Yi [Thu, 21 Sep 2017 16:32:35 +0000 (16:32 +0000)]
Import translations. DO NOT MERGE am:
de5eefa935 -s ours am:
9d008286c7 -s ours am:
b4e9b3f651 -s ours am:
7139a4dd5e -s ours
am:
1270fa196a -s ours
Change-Id: I98245b3c39a0e25fafd042b5f8d528d385aaf892
Bill Yi [Thu, 21 Sep 2017 16:29:28 +0000 (16:29 +0000)]
Import translations. DO NOT MERGE am:
de5eefa935 -s ours am:
9d008286c7 -s ours am:
b4e9b3f651 -s ours am:
7139a4dd5e -s ours
am:
341759f995 -s ours
Change-Id: Ibf2a76d8459c88f24f1ef59f96e2a89e46ff89e8
Android Build Merger (Role) [Thu, 21 Sep 2017 16:22:38 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE am:
50e19c566e -s ours am:
e708378dc9 -s ours am:
05d82e887a -s ours" into oc-mr1-dev-plus-aosp
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:19:40 +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: I7192304b8aaad74dfab22571892b66e8c84a9736
Bill Yi [Thu, 21 Sep 2017 16:19:07 +0000 (16:19 +0000)]
Import translations. DO NOT MERGE am:
50e19c566e -s ours am:
e708378dc9 -s ours
am:
05d82e887a -s ours
Change-Id: Ie960ff87958349e40171a1205dc67794fcf27826
Bill Yi [Thu, 21 Sep 2017 16:18:01 +0000 (16:18 +0000)]
Import translations. DO NOT MERGE am:
50e19c566e -s ours am:
e708378dc9 -s ours
am:
e7f7be9e14 -s ours
Change-Id: I7e88ec07c8fd6b0b595f675fd4f0f2e77cbcca77
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:11:12 +0000 (16:11 +0000)]
Import translations. DO NOT MERGE am:
50e19c566e -s ours
am:
e708378dc9 -s ours
Change-Id: Ifdce36eb6dbb6c0af7a1f65d9142e77b05a2f5da
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
vichang [Thu, 21 Sep 2017 12:59:40 +0000 (12:59 +0000)]
Merge "Remove StructGroupSourceReq" am:
c7d27845df am:
4c86c99273
am:
8e29e292a3
Change-Id: I14e115957e4a4c90fdacebddad50cece186a303c
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:21:04 +0000 (12:21 +0000)]
Merge "Implement ConnectivityService TODO and fix many race conditions" am:
f6b72dd145 am:
8bb2cdea00
am:
287c334379
Change-Id: Ia59d45f4e95a536d7982f61ac9c9a1bfc5e8ebb8
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:06:05 +0000 (12:06 +0000)]
Merge "Also support 464xlat on SUSPENDED networks" am:
995a28d334 am:
69a28066bd
am:
1347ac8109
Change-Id: I83ae39a2e36bc036dce419c80dd476d2358b4537
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
Tony Mak [Thu, 21 Sep 2017 09:24:15 +0000 (09:24 +0000)]
Merge "Use noteOpNoThrow instead in AMS" into oc-mr1-dev
am:
d3293ab4c5
Change-Id: I7f4eda96cba30740edf82505e0dc9b94d9e4bd51
TreeHugger Robot [Thu, 21 Sep 2017 09:17:12 +0000 (09:17 +0000)]
Merge "Use noteOpNoThrow instead in AMS" into oc-mr1-dev
Tony Mak [Wed, 20 Sep 2017 20:23:48 +0000 (21:23 +0100)]
Use noteOpNoThrow instead in AMS
We just want a boolean result to tell whether a package has certain permissions,
we do not expect the check to throw SecurityException, so let's use
noteOpNoThrow instead.
Fixes:
65912167
Test: Disable Gmail, install a test app and run setPassword. No crash.
Change-Id: Ifc6e7fbbae1121bda329f0a291522af9698959db
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:57:59 +0000 (08:57 +0000)]
Merge "have OffloaderController store and re-push more state" am:
69efc596af am:
7a5dd80c95
am:
cf0c15b54d
Change-Id: Iad1cac097a43c9b10fff9b0bb9625af5053eca04
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
Selim Cinek [Thu, 21 Sep 2017 01:38:09 +0000 (01:38 +0000)]
Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
am:
204346c277
Change-Id: I0723bc15fb651881ee9c42fd59c2a94abc761c42
TreeHugger Robot [Thu, 21 Sep 2017 01:29:53 +0000 (01:29 +0000)]
Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
Bill Yi [Thu, 21 Sep 2017 00:30:59 +0000 (17:30 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Id18eae6765a58a33689a652fca0d0d48e78596f1
Felipe Leme [Tue, 19 Sep 2017 20:08:24 +0000 (13:08 -0700)]
Remove finished sessions on ACTION_CLOSE_SYSTEM_DIALOGS.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.SimpleSaveActivityTest#testTapHomeWhileSaveUiIsShowing
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.SimpleSaveActivityTest#testTapHomeWhileDatasetPickerUiIsShowing
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes:
65414762
Change-Id: I7dc9fd8f40341164e0ca320ff49b99cf8614fdbf
Erik Kline [Wed, 20 Sep 2017 23:39:11 +0000 (23:39 +0000)]
Merge "have OffloaderController store and re-push more state" into oc-mr1-dev
am:
1dd52a8017
Change-Id: If3a859736a1b3730e4e3d0d2685f3e5432927796
TreeHugger Robot [Wed, 20 Sep 2017 23:28:08 +0000 (23:28 +0000)]
Merge "have OffloaderController store and re-push more state" into oc-mr1-dev
Selim Cinek [Wed, 20 Sep 2017 22:52:29 +0000 (22:52 +0000)]
Revert "Increased the text size for colorized notifications"
This reverts commit
299b3302ef6ea5094f094e92f384853aa012172b.
Change-Id: Id887bd37f8f7b0c1ff48c339c9d59491f65cae84
Bug:
35925915
Fixes:
66067974
Tyler Gunn [Wed, 20 Sep 2017 21:37:39 +0000 (21:37 +0000)]
Merge "De-couple data enabled from VT settings." am:
29fc1d78a9 am:
c7588904ba
am:
28097531ac
Change-Id: Ib214d4838862e2f841d318769c56fd749f7aeded
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
Julia Reynolds [Wed, 20 Sep 2017 20:20:19 +0000 (20:20 +0000)]
Merge "Track the earliest alarm for exiting DND." into oc-mr1-dev
am:
082e11b28d
Change-Id: I5fad835e1327d9ebdc29c268124525153d5d7aa0
Tyler Gunn [Wed, 20 Sep 2017 20:19:30 +0000 (20:19 +0000)]
Merge "De-couple data enabled from VT settings."
Julia Reynolds [Wed, 20 Sep 2017 20:14:17 +0000 (20:14 +0000)]
Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev
am:
098dae1b3e
Change-Id: I2bc381f8f155033fa218d43af8842044626e3404
TreeHugger Robot [Wed, 20 Sep 2017 20:02:05 +0000 (20:02 +0000)]
Merge "Track the earliest alarm for exiting DND." into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 20:01:33 +0000 (20:01 +0000)]
Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev
Jonathan Basseri [Wed, 20 Sep 2017 19:24:24 +0000 (19:24 +0000)]
Merge "Convert ICarrierService to oneway." into oc-mr1-dev
am:
806af68f5d
Change-Id: Ifd29502f4fb0ad02216e6f9b7c48cb332f89dea2
Yin-Chia Yeh [Wed, 20 Sep 2017 19:16:50 +0000 (19:16 +0000)]
Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev
am:
b1b99b0299
Change-Id: I1f4817fbc32ba186229eb36fe726e6f4ff2fad16
Jonathan Basseri [Wed, 20 Sep 2017 19:16:24 +0000 (19:16 +0000)]
Merge "Convert ICarrierService to oneway." into oc-mr1-dev
Tyler Gunn [Wed, 20 Sep 2017 19:11:15 +0000 (19:11 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice." am:
9cc6286675 am:
53a0c05f47
am:
fea3f2e8c6
Change-Id: I2ef9f40ec0487faa19ea8aa005607296d646e78a
TreeHugger Robot [Wed, 20 Sep 2017 19:06:01 +0000 (19:06 +0000)]
Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev
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."
Makoto Onuki [Wed, 20 Sep 2017 17:33:20 +0000 (17:33 +0000)]
Merge "Fix STOPSHIP in SyncManager" into oc-mr1-dev
am:
80683fc983
Change-Id: Ie6135bbae0151fbcb30f8d797234aa7986bb98ad
TreeHugger Robot [Wed, 20 Sep 2017 17:27:40 +0000 (17:27 +0000)]
Merge "Fix STOPSHIP in SyncManager" into oc-mr1-dev
Jason Monk [Wed, 20 Sep 2017 17:10:30 +0000 (17:10 +0000)]
Merge "Fix random systemui crashes during boot" am:
8078996f4a -s ours am:
7b4087acdb
am:
f7aeee2ca5
Change-Id: Ib02b2f73f86d9678a53b717696232dd71bb0579f
Android Build Merger (Role) [Wed, 20 Sep 2017 17:06:23 +0000 (17:06 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad am:
94089cefe1" into oc-mr1-dev-plus-aosp
Eric Laurent [Wed, 20 Sep 2017 17:03:35 +0000 (17:03 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad
am:
94089cefe1
Change-Id: I996ef93c75788c4712f81278cb8ca7f59167e812
Eric Laurent [Wed, 20 Sep 2017 17:02:15 +0000 (17:02 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad
am:
0c4a9d2714
Change-Id: I9637e4b9e12908cee03f398c5ef91e89ea8e32e1
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:47 +0000 (16:54 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets
am:
630f37a4ad
Change-Id: Ied24bdcddc54255c3a287ffa871148177ad097f7
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
Shubham Ajmera [Wed, 20 Sep 2017 16:29:15 +0000 (16:29 +0000)]
Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev
am:
15f814e36e
Change-Id: Ia35c3ff6e3c8fd2af13604134051128747ba36e9
Ray Essick [Wed, 20 Sep 2017 16:20:51 +0000 (16:20 +0000)]
Merge "packagemanager_native access to package installer, version" into oc-mr1-dev
am:
71ab6f6555
Change-Id: I552b7d549a129d1188db8ae6957ba7fb80149d0f
Shubham Ajmera [Wed, 20 Sep 2017 16:13:00 +0000 (16:13 +0000)]
Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev
Ray Essick [Wed, 20 Sep 2017 16:08:47 +0000 (16:08 +0000)]
Merge "packagemanager_native access to package installer, version" into oc-mr1-dev
Beverly [Wed, 20 Sep 2017 16:07:47 +0000 (16:07 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev
am:
8e84dfec6a
Change-Id: I779fde484505f8fd6e5a19397b670299970320c9
TreeHugger Robot [Wed, 20 Sep 2017 16:02:46 +0000 (16:02 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev
Neil Fuller [Wed, 20 Sep 2017 15:44:32 +0000 (15:44 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev
am:
36e5c8e7ed
Change-Id: Ib1ee3dae5b5b25a2ebdf1fea21d080cfbf506af2
Neil Fuller [Wed, 20 Sep 2017 15:39:37 +0000 (15:39 +0000)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master am:
8acdb8aa65
am:
93fcfbc8cb -s ours
Change-Id: I5eb5f54262cbcb38095ff5a6092c200c839e6987
Neil Fuller [Wed, 20 Sep 2017 15:36:47 +0000 (15:36 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev
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
Rubin Xu [Wed, 20 Sep 2017 15:28:29 +0000 (15:28 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
am:
223a65f3f5
Change-Id: I3bba8e337fe57999daf1e7d8ff90a9f7bfc6831d
Rubin Xu [Wed, 20 Sep 2017 15:15:42 +0000 (15:15 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
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
Alan Viverette [Wed, 20 Sep 2017 14:09:01 +0000 (14:09 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev
am:
286c7db342
Change-Id: I82092817d26af0a372923d238b9f84112f196ad2
TreeHugger Robot [Wed, 20 Sep 2017 13:59:05 +0000 (13:59 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev
Jason Monk [Wed, 20 Sep 2017 13:50:45 +0000 (13:50 +0000)]
Merge "Fix random systemui crashes during boot"
Julia Reynolds [Tue, 19 Sep 2017 17:10:26 +0000 (13:10 -0400)]
Track the earliest alarm for exiting DND.
Test: manual
Change-Id: Ifa7ae6b6f3f8ff2c7cc8382ab73bf2bc89cd085e
Fixes:
65332502
Julia Reynolds [Fri, 15 Sep 2017 18:26:32 +0000 (14:26 -0400)]
DND apps might not have a service, and that's ok
Also add logging for permission changes.
Bug:
64969998
Test: manual; trigger backup and verify dnd apps still have dnd
access.
Change-Id: Iefa14a6a1130fb4cc823fe6979f6b5a7b212ca4b
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
OSDN Git Service
