OSDN Git Service
Felipe Leme [Thu, 21 Sep 2017 22:01:56 +0000 (22:01 +0000)]
Merge "Only call negative listener when SaveUI is dismissed by tapping button." into oc-mr1-dev am:
e8041834b1
am:
855495d733
Change-Id: I7a9987a3dbdad402b128f808876ff7f7ae59b5e2
Eino-Ville Talvala [Thu, 21 Sep 2017 21:57:48 +0000 (21:57 +0000)]
Merge "Camera: Add more documentation about thrown exceptions." into oc-mr1-dev am:
a120e6b604
am:
5c8027a159
Change-Id: Ideb508436828aff5667777a526aeef4da1d51fab
Felipe Leme [Thu, 21 Sep 2017 21:51:14 +0000 (21:51 +0000)]
Merge "Only call negative listener when SaveUI is dismissed by tapping button." into oc-mr1-dev
am:
e8041834b1
Change-Id: I3e2bfcf5f2e00e542b0a4516f2c1eebd4f378218
TreeHugger Robot [Thu, 21 Sep 2017 21:50:29 +0000 (21:50 +0000)]
Merge "Fix wifi tile animating full-dark when slashing/unslashing"
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 20:44:50 +0000 (20:44 +0000)]
Merge "Only call negative listener when SaveUI is dismissed by tapping button." into oc-mr1-dev
TreeHugger Robot [Thu, 21 Sep 2017 20:24:59 +0000 (20:24 +0000)]
Merge "Preventing data overwirte in a Parcel"
Evan Laird [Thu, 21 Sep 2017 18:11:00 +0000 (14:11 -0400)]
Fix wifi tile animating full-dark when slashing/unslashing
WifiTile now owns a specific tile view that will animate the tint/alpha
of the slash but not the underlying drawable. Becasue we always animate
from the disconnected icon <-> disabled icon, this fixes the problem
where the disabled icon will start off as full-dark and appear to flash.
Fixes:
63534380
Test: turn wifi on/off; runtest -x
tests/src/com/android/systemui/qs/AlphaControlledSignalTileViewTest.java
Change-Id: I824572fdf00e122b7c17104b727171d81ff104c5
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 19:00:28 +0000 (19:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
20f3c4508c -s ours
am:
2a8734c90b -s ours
Change-Id: If40b4dc7ae398f9b0d8ae7705ab2abc294b0c55a
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
Sunny Goyal [Thu, 21 Sep 2017 18:08:34 +0000 (11:08 -0700)]
Preventing data overwirte in a Parcel
Test: am instrument -w -e class android.widget.RemoteViewsTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug:
65576228
Change-Id: Ia1f072c1451eba3c6c13833c5a813e754df901e2
Andreas Gampe [Thu, 21 Sep 2017 18:19:19 +0000 (18:19 +0000)]
Merge "Binder: Update to new ScopedLocalRef"
David Stevens [Thu, 21 Sep 2017 18:17:38 +0000 (18:17 +0000)]
Merge "Prefer the launch display to the source when looking for task/stack"
Andreas Gampe [Thu, 21 Sep 2017 17:55:59 +0000 (10:55 -0700)]
Binder: Update to new ScopedLocalRef
Follow-up to commit
625e0007ac07c5aefb4b3d486575ab916116c129 and
commit
fac8cb2405999d18aefd75387a5bbdb0c6160e7f.
Bug:
64689630
Test: m
Change-Id: I119cf83a5a54c15973ed3701ee448a9590bb404d
TreeHugger Robot [Thu, 21 Sep 2017 17:23:45 +0000 (17:23 +0000)]
Merge "Binder: Clean up JNI code"
Felipe Leme [Thu, 21 Sep 2017 17:14:41 +0000 (17:14 +0000)]
Merge "Remove finished sessions on ACTION_CLOSE_SYSTEM_DIALOGS." into oc-mr1-dev am:
56e5c3944b
am:
64a6188032
Change-Id: I568c3a67d43b0a1eb1af4350f523ba291c5ea9f2
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
Winson Chung [Thu, 21 Sep 2017 17:00:58 +0000 (17:00 +0000)]
Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev am:
66f2d56556
am:
58c6e603b2
Change-Id: Ic58e8010f52e1665b21fc99b90c4cffd1374b5db
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
Bill Yi [Thu, 21 Sep 2017 16:52:49 +0000 (16:52 +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
am:
2c786b63c7 -s ours
Change-Id: Ia2161c1381632e4f72abe28eb8cb0997164b4b5a
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
Bill Yi [Thu, 21 Sep 2017 16:45:59 +0000 (16:45 +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
am:
074bc660e2 -s ours
Change-Id: Ib9b7081284b5d354ae430a293a1dde4b043ea226
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:33:49 +0000 (16:33 +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
am:
d66c1a54f4 -s ours
Change-Id: Id98cbb9662821b45777d37a1dbf0921ddff45e6b
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
Bill Yi [Thu, 21 Sep 2017 16:28:17 +0000 (16:28 +0000)]
Import translations. DO NOT MERGE am:
50e19c566e -s ours am:
e708378dc9 -s ours am:
e7f7be9e14 -s ours
am:
e945dbb3f5 -s ours
Change-Id: I26c6bd4244d3a1ab901593745f59e5c05b4a07eb
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
Jeff Sharkey [Thu, 21 Sep 2017 15:39:08 +0000 (15:39 +0000)]
Merge "Only construct real Throwable objects."
Kenny Guy [Thu, 21 Sep 2017 13:48:45 +0000 (13:48 +0000)]
Merge "Fix typo in Settings.BOOT_COUNT"
vichang [Thu, 21 Sep 2017 13:05:50 +0000 (13:05 +0000)]
Merge "Remove StructGroupSourceReq" am:
c7d27845df am:
4c86c99273 am:
8e29e292a3
am:
cdb0cd4ec8
Change-Id: I8361e401f903e2220a078eda0837b2d45eaac2cf
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:27:42 +0000 (12:27 +0000)]
Merge "Implement ConnectivityService TODO and fix many race conditions" am:
f6b72dd145 am:
8bb2cdea00 am:
287c334379
am:
dae21ba0a4
Change-Id: I1d4d3a75eb0e6cdfa348d8f877a5cdc5586b2551
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
Erik Kline [Thu, 21 Sep 2017 12:10:40 +0000 (12:10 +0000)]
Merge "Also support 464xlat on SUSPENDED networks" am:
995a28d334 am:
69a28066bd am:
1347ac8109
am:
5739596659
Change-Id: Iacc209990bd7be57578bc52c9f57c63e0540209e
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"
Kenny Guy [Thu, 21 Sep 2017 10:40:44 +0000 (11:40 +0100)]
Fix typo in Settings.BOOT_COUNT
Change-Id: Idc274d55e4c26584288455f8087776d0a8b930e5
Test: make docs
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:30:30 +0000 (09:30 +0000)]
Merge "Use noteOpNoThrow instead in AMS" into oc-mr1-dev am:
d3293ab4c5
am:
8bc2569538
Change-Id: I23fff8cb959ad183c0b15654c7c7f3f3dc2764ed
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 09:04:58 +0000 (09:04 +0000)]
Merge "have OffloaderController store and re-push more state" am:
69efc596af am:
7a5dd80c95 am:
cf0c15b54d
am:
157906f73d
Change-Id: Ib0f1fd39fb5b690108f82b5d8a932f44bfc6df60
TreeHugger Robot [Thu, 21 Sep 2017 09:03:05 +0000 (09:03 +0000)]
Merge "Add missing key for temporary battery process event and missing tag id for process Test: tested locally"
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"
yro [Thu, 21 Sep 2017 01:08:22 +0000 (18:08 -0700)]
Add timestamp pair to stats log
Test: tested locally
Change-Id: I70dfb0856c8410d55ea9cc6eaf1377961139ecd8
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)
yro [Thu, 21 Sep 2017 05:51:26 +0000 (22:51 -0700)]
Add missing key for temporary battery process event and missing tag id
for process
Test: tested locally
Change-Id: I1ef376ba9478e1e88ff09fb201078d4972d8d51b
Hyundo Moon [Thu, 21 Sep 2017 05:03:27 +0000 (05:03 +0000)]
Merge "Prevent system crash when adjusting volume with illegal direction"
Selim Cinek [Thu, 21 Sep 2017 04:45:56 +0000 (04:45 +0000)]
Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev am:
204346c277
am:
98507bebf0
Change-Id: Ibb867d26b6580adcbf53632def2bc16563362d5a
Erik Kline [Thu, 21 Sep 2017 04:42:58 +0000 (04:42 +0000)]
Merge "have OffloaderController store and re-push more state" into oc-mr1-dev am:
1dd52a8017
am:
48db1fb74f
Change-Id: If9afc160fa2f8b5da66cb0a6a35dfcb4f1839d36
TreeHugger Robot [Thu, 21 Sep 2017 04:35:38 +0000 (04:35 +0000)]
Merge "Using bundle instead of a custom class for SaveInstanceState"
Tyler Gunn [Thu, 21 Sep 2017 04:10:42 +0000 (04:10 +0000)]
Merge "De-couple data enabled from VT settings." am:
29fc1d78a9 am:
c7588904ba am:
28097531ac
am:
0509e5c850
Change-Id: I45314ed256c8d88df135063531ad17292e895b43
Julia Reynolds [Thu, 21 Sep 2017 04:04:41 +0000 (04:04 +0000)]
Merge "Track the earliest alarm for exiting DND." into oc-mr1-dev am:
082e11b28d
am:
496c31de00
Change-Id: Id31b145e0a78b82e6ab22dfe305b145a121f6282
Julia Reynolds [Thu, 21 Sep 2017 04:02:31 +0000 (04:02 +0000)]
Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev am:
098dae1b3e
am:
1f8c8eab29
Change-Id: Iee46c170f074dfb3309ac42718fab66022f59239
Jonathan Basseri [Thu, 21 Sep 2017 03:59:21 +0000 (03:59 +0000)]
Merge "Convert ICarrierService to oneway." into oc-mr1-dev am:
806af68f5d
am:
c323c9f4e9
Change-Id: Iaab75e584578be138d9e629bec59e32691771b67
Yin-Chia Yeh [Thu, 21 Sep 2017 03:39:01 +0000 (03:39 +0000)]
Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev am:
b1b99b0299
am:
4cc70cc018
Change-Id: I5c2ebc6f8ccb09dccf454d5cef062574e62d4660
Tyler Gunn [Thu, 21 Sep 2017 03:34:36 +0000 (03:34 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice." am:
9cc6286675 am:
53a0c05f47 am:
fea3f2e8c6
am:
b737dc50e7
Change-Id: Ie234c742198a7a007e2693cca05a5ddc12c47dde
Makoto Onuki [Thu, 21 Sep 2017 03:31:10 +0000 (03:31 +0000)]
Merge "Fix STOPSHIP in SyncManager" into oc-mr1-dev am:
80683fc983
am:
c36417d6d2
Change-Id: I55bb42f8ee1551d29283538f5f89dd83c104335a
Jason Monk [Thu, 21 Sep 2017 03:28:09 +0000 (03:28 +0000)]
Merge "Fix random systemui crashes during boot" am:
8078996f4a -s ours am:
7b4087acdb am:
f7aeee2ca5
am:
4d1b16fa18
Change-Id: I21ee4d48875e8a15ef7ff82fdddbb3a58a81ea04
Eric Laurent [Thu, 21 Sep 2017 03:22:45 +0000 (03:22 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad am:
94089cefe1" into oc-mr1-dev-plus-aosp
am:
c079a6180d
Change-Id: Ib4912f0787077af66e492d4f11c8243b08bb837b
Eric Laurent [Thu, 21 Sep 2017 03:17:52 +0000 (03:17 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad am:
0c4a9d2714
am:
31e86f44a0
Change-Id: If2b8d0875760ff45a2a2039ee08d786b95f67c2b
Shubham Ajmera [Thu, 21 Sep 2017 03:14:27 +0000 (03:14 +0000)]
Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev am:
15f814e36e
am:
9f2baf1853
Change-Id: I7295e91cdcc8dbe3251b3ab93add1e26207c703c
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
Android Build Merger (Role) [Thu, 21 Sep 2017 03:09:59 +0000 (03:09 +0000)]
Merge "Merge "packagemanager_native access to package installer, version" into oc-mr1-dev am:
71ab6f6555 am:
81799dce0b"
Ray Essick [Thu, 21 Sep 2017 03:06:34 +0000 (03:06 +0000)]
Merge "packagemanager_native access to package installer, version" into oc-mr1-dev am:
71ab6f6555
am:
81799dce0b
Change-Id: Iab1d843e997854747b1275991c7a3a6cf5a1fc03
Android Build Merger (Role) [Thu, 21 Sep 2017 03:04:38 +0000 (03:04 +0000)]
Merge "Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev am:
8e84dfec6a am:
3cc49656fb"
Beverly [Thu, 21 Sep 2017 03:03:01 +0000 (03:03 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev am:
8e84dfec6a
am:
3cc49656fb
Change-Id: I1f07fe09251a88fec1e466bbd52e8c053a1601b2
Android Build Merger (Role) [Thu, 21 Sep 2017 03:02:25 +0000 (03:02 +0000)]
Merge "Merge "Fix reliability triggering" into oc-mr1-dev am:
36e5c8e7ed am:
5bd0a22243"
Neil Fuller [Thu, 21 Sep 2017 03:00:11 +0000 (03:00 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev am:
36e5c8e7ed
am:
5bd0a22243
Change-Id: I5258375c803332b49bf21f7c161eda13054c81b7
Android Build Merger (Role) [Thu, 21 Sep 2017 02:59:27 +0000 (02:59 +0000)]
Merge "resolve merge conflicts of
83c367aa5b48 to stage-aosp-master am:
8acdb8aa65 am:
93fcfbc8cb -s ours am:
2540844f6d"
TreeHugger Robot [Thu, 21 Sep 2017 02:59:06 +0000 (02:59 +0000)]
Merge "Pass text direction from DynamicLayout to Layout"
Neil Fuller [Thu, 21 Sep 2017 02:54:31 +0000 (02:54 +0000)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master am:
8acdb8aa65 am:
93fcfbc8cb -s ours
am:
2540844f6d
Change-Id: I6fc02e2e892aa101afc2f77a89f27d518886e638
Rubin Xu [Thu, 21 Sep 2017 02:52:03 +0000 (02:52 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev am:
223a65f3f5
am:
656c519dd7
Change-Id: I8c55be53d2a3bc53e5f003db61a5d78dd49c053c
OSDN Git Service
