OSDN Git Service
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"
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
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
Sunny Goyal [Wed, 30 Aug 2017 23:08:25 +0000 (16:08 -0700)]
Using bundle instead of a custom class for SaveInstanceState
Also removing the crossfade effect option which has been disabled since the start
Test: N/A
Change-Id: I0c5dcf0d81d8a0a60f4cf202b63a3b9aafcee98e
Android Build Merger (Role) [Thu, 21 Sep 2017 01:51:14 +0000 (01:51 +0000)]
Merge "Merge "Handle null left and right tab strip drawables" into oc-mr1-dev am:
286c7db342 am:
7dbf5b032b"
Alan Viverette [Thu, 21 Sep 2017 01:46:55 +0000 (01:46 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev am:
286c7db342
am:
7dbf5b032b
Change-Id: I5c3f616276f1f68a134c48f886cc43d282400415
TreeHugger Robot [Thu, 21 Sep 2017 01:45:20 +0000 (01:45 +0000)]
Merge "Statsd namespace is defined and used"
Victor Chang [Thu, 21 Sep 2017 01:43:19 +0000 (01:43 +0000)]
Merge "Remove StructGroupSourceReq" into oc-mr1-dev-plus-aosp
am:
ea8a114743
Change-Id: Ie44da7ca28665a0769da7a1d7231d02cf4942c5d
Karthik Ravi Shankar [Thu, 21 Sep 2017 01:38:23 +0000 (01:38 +0000)]
Merge "Fix window visibility during layout" into oc-mr1-dev am:
7a59a62276
am:
11f25ba1a0
Change-Id: I3620a51554e6e8101d5a013f9287339bb1031806
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
TreeHugger Robot [Thu, 21 Sep 2017 01:04:06 +0000 (01:04 +0000)]
Merge "Changed reparentChild method name to reparent."
TreeHugger Robot [Thu, 21 Sep 2017 00:50:47 +0000 (00:50 +0000)]
Merge "Convert ActivityManager dumpsys to protobuf"
Fyodor Kupolov [Thu, 21 Sep 2017 00:04:11 +0000 (00:04 +0000)]
Merge "Dump total execution time per connection pool"
TreeHugger Robot [Wed, 20 Sep 2017 23:58:32 +0000 (23:58 +0000)]
Merge "Divide dumpsys services into different buckets"
Bookatz [Wed, 20 Sep 2017 22:26:44 +0000 (15:26 -0700)]
Statsd namespace is defined and used
Statsd code now lives in android::os::statsd namespace. Existing files
are largely modified to follow this convention.
Exception: parse_util, since it seems a bit different.
Test: code compiles and existing statsd_tests still pass
Change-Id: Idf92a071b9ed172d01eb3087a4fa3609d67a038c
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
Robert Quattlebaum [Tue, 15 Aug 2017 01:34:03 +0000 (18:34 -0700)]
Ensure lowpan UID can manage LoWPAN interfaces
Bug: b/
64399805
Change-Id: Idd0bd7ef0c4de48c95699efc43324bc4dce8e70a
Roozbeh Pournader [Wed, 20 Sep 2017 23:07:13 +0000 (16:07 -0700)]
Pass text direction from DynamicLayout to Layout
Previously, we were calling the wrong constructor for Layout, which
didn't have a text direction.
Bug:
65330510
Test: bit FrameworksCoreTests:android.widget.EditorCursorTest
Test: bit FrameworksCoreTests:android.text.DynamicLayoutTest
Test: bit CtsTextTestCases:android.text.cts.DynamicLayoutTest
Change-Id: Idf0ac781dc8d6641184b7deabe990cd0e451ad26
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
TreeHugger Robot [Wed, 20 Sep 2017 23:11:13 +0000 (23:11 +0000)]
Merge "statsd & statscompanion communication more robust"
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
Vishnu Nair [Wed, 13 Sep 2017 17:41:28 +0000 (10:41 -0700)]
Divide dumpsys services into different buckets
cpuinfo dumps all on dumpCritical
meminfo dumps all dumpNormal (temp)
activity dumps activities on dumpCritical, dumps all on normal
window dumps all on dumpCritical
BUG:
31774394
Test: adb bugreport > /tmp/bugreport.zip
Test: frameworks/base/services/tests/runtests.py -e class
"com.android.server.utils.PriorityDumpTest"
Change-Id: I529a709ec8654d314515ebd559894b4eacdc8968
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
TreeHugger Robot [Wed, 20 Sep 2017 21:30:13 +0000 (21:30 +0000)]
Merge "Add start margin to preference icon."
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
Bookatz [Mon, 18 Sep 2017 18:26:01 +0000 (11:26 -0700)]
statsd & statscompanion communication more robust
If statsd or statsdcompanion crashes, or if one loads
before the other, the other will be able to accomodate.
When statsd loads, it will attempt to tell statscompanion that it's
alive, and then get on to its business, while assuming that
statscompanion is not alive. Only when statscompanion tells statsd
that it is alive, statsd will then start to use it.
When statscompanion loads, it will attempt to tell statsd that it's
alive and then do nothing (since it has nothing to do). When statsd
tells statscompanion that statsd is alive, statscompanion will respond,
telling statsd that it is alive and, if that binder call returns, will
get to work.
This way, if statsd loads first, it can work unobstructed until
statscompanion informs statsd that it is alive, at which point they
shake hands and work. Conversely, if statscompanion loads first, it will
do nothing until statsd contacts it, at which point they will shake
hands and work.
Test: manual
Change-Id: I969ad47fb8060e27814d05ad37433a02711cfa6a
TreeHugger Robot [Wed, 20 Sep 2017 21:13:07 +0000 (21:13 +0000)]
Merge "StatsCompanionService sends messages to statsd"
TreeHugger Robot [Wed, 20 Sep 2017 20:47:06 +0000 (20:47 +0000)]
Merge "incidentd: fix memory leaks in a test"
Jeffrey Huang [Wed, 20 Sep 2017 20:27:08 +0000 (20:27 +0000)]
Merge "Add metric for oem unlock dialog"
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
Doris Ling [Wed, 20 Sep 2017 18:38:40 +0000 (11:38 -0700)]
Add start margin to preference icon.
We would like to align the preference icon with the back button above.
Adding the start margin for the icon frame, so that it will be
placed further to the right.
Fixes:
64696037
Test: visual
Change-Id: I3fbcd40fea40bf5a41c1e4281a559e4012664266
Steven Timotius [Tue, 12 Sep 2017 18:07:21 +0000 (11:07 -0700)]
Convert ActivityManager dumpsys to protobuf
Also adding ActivityInfo.RESIZE_MODE_RESIZEABLE to TestApi
Test: cts-tradefed run commandAndExit cts-dev --module CtsActivityManagerDeviceTestCases
Change-Id: I958aa155b266799840ece1ca07feed8593724449
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