Emilian Peev
|
a481fdf08f
|
Merge "Camera: Populate Image tranformation in reader and writer" into pi-dev am: d41fed72c7
am: b05f2511e2
Change-Id: I273321efbb1691fdbfe5610e19aa084cd47c6e9a
|
2018-03-20 13:07:55 +00:00 |
|
Amin Shaikh
|
2f2ae6f203
|
Merge "Do not display <unknown ssid>." into pi-dev am: fc841b26a9
am: 6bc121023f
Change-Id: Iabeeb7535ba0ae7fe091cf657448b2f21d1bd79c
|
2018-03-20 12:58:09 +00:00 |
|
Amin Shaikh
|
d778b88810
|
Merge "Update mobile data type icons." into pi-dev am: c7a04bbb47
am: 34b13dce8c
Change-Id: I2fac2d50697da241f3595914c33f336d5bd858bf
|
2018-03-20 12:51:31 +00:00 |
|
Emilian Peev
|
b05f2511e2
|
Merge "Camera: Populate Image tranformation in reader and writer" into pi-dev
am: d41fed72c7
Change-Id: I815e500c94532a4560ec5cb0940e076d95a2d788
|
2018-03-20 12:51:17 +00:00 |
|
Amin Shaikh
|
6bc121023f
|
Merge "Do not display <unknown ssid>." into pi-dev
am: fc841b26a9
Change-Id: I7cd7067f6413743f1c8a45455310695c23665099
|
2018-03-20 12:41:38 +00:00 |
|
Amin Shaikh
|
34b13dce8c
|
Merge "Update mobile data type icons." into pi-dev
am: c7a04bbb47
Change-Id: I032ea831cb434516798b4993af4a5fecd54da416
|
2018-03-20 12:34:54 +00:00 |
|
TreeHugger Robot
|
d41fed72c7
|
Merge "Camera: Populate Image tranformation in reader and writer" into pi-dev
|
2018-03-20 12:33:37 +00:00 |
|
TreeHugger Robot
|
fc841b26a9
|
Merge "Do not display <unknown ssid>." into pi-dev
|
2018-03-20 12:23:28 +00:00 |
|
TreeHugger Robot
|
c7a04bbb47
|
Merge "Update mobile data type icons." into pi-dev
|
2018-03-20 12:19:29 +00:00 |
|
Amin Shaikh
|
c7593b1e1a
|
Do not display <unknown ssid>.
Fixes: 73853121
Test: runtest systemui
Change-Id: Ib16a63cb9edfbd287724500adf515287f12c0d07
|
2018-03-20 11:43:16 +00:00 |
|
Alison Cichowlas
|
5ad3547a7c
|
Merge "@ignore flaky test" into pi-dev am: 31d58db7c3
am: 427db21cdb
Change-Id: I28739557b1d361a89ff674d5c7692427c2bde4c8
|
2018-03-20 08:25:01 +00:00 |
|
Alison Cichowlas
|
427db21cdb
|
Merge "@ignore flaky test" into pi-dev
am: 31d58db7c3
Change-Id: I7adae695d33e3f089242526bdd0a9e67d8f49eae
|
2018-03-20 08:08:49 +00:00 |
|
Andreas Gampe
|
f56e5b7fb0
|
Merge "Frameworks: Handle exceptions in SystemProperties callbacks" into pi-dev am: 837f1364f6 -s ours
am: 45c0ef2ca1 -s ours
Change-Id: I097b9d9f1d77c7da5a8dead4d72da05d1e25d5cf
|
2018-03-20 07:59:38 +00:00 |
|
kopriva
|
ee6def96f3
|
docs: fixing typo, bug 36909553 am: 4dddc63ee7 am: fdffe0a8be
am: 9c6821025f
Change-Id: I22c0bbced4de4da951f187586a6ae47deff31c53
|
2018-03-20 07:51:12 +00:00 |
|
TreeHugger Robot
|
31d58db7c3
|
Merge "@ignore flaky test" into pi-dev
|
2018-03-20 07:47:54 +00:00 |
|
Lucas Dupin
|
8afdd72ab7
|
Merge "Ease out clock translation" into pi-dev am: 255352437f
am: f9727309c8
Change-Id: Id1522c3a133f8e7234e6fc8dcbf1e480a7d8a617
|
2018-03-20 07:41:11 +00:00 |
|
Jeff Davidson
|
fc2d5449c9
|
Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." into pi-dev am: 2ca77fe976
am: 1bccf3e781
Change-Id: I6bf7f6572d4c0736e7fe4228a8a0e3ea3ead3b54
|
2018-03-20 07:01:05 +00:00 |
|
Sunny Goyal
|
7e10028abc
|
Merge "Updating java doc for requestPinAppWidget" into pi-dev am: dbb0a49f00
am: 1f42bf5b6d
Change-Id: I0d4ecbd0a7e164a892cfcfa6ee2734c5deac1a3e
|
2018-03-20 06:48:21 +00:00 |
|
Chavi Weingarten
|
9949316699
|
Merge "Ensure pause when turnScreenOn flag is removed" into pi-dev am: 211078e1c3
am: 56ffb646c7
Change-Id: I33b5621e6a4bb5685448f6c64cbcd32be9c32f3f
|
2018-03-20 06:45:16 +00:00 |
|
Winson Chung
|
e465160c0c
|
Merge changes I0c466350,I09a9cd43,I8b2a0819 into pi-dev am: 4cda02f25f
am: 9dcc7b982b
Change-Id: Id79f409381fa6b211329ef85b13cd7f4202dccb0
|
2018-03-20 06:40:24 +00:00 |
|
Chris Tate
|
bce8b0f994
|
Merge "Don't ANR if a broadcast recipient is sitting at a breakpoint" into pi-dev am: 8ada330da7
am: 146c848d5b
Change-Id: I9e11df0722e043ce2d7c28b8c233a791be6efd03
|
2018-03-20 06:37:24 +00:00 |
|
Lei Yu
|
e2c41c0de8
|
Merge "Add metric for battery tip action" into pi-dev am: 1817c1329f
am: 3e2c262b46
Change-Id: Id226f027b3f60f8e75ec099f4c24a47db9734c79
|
2018-03-20 06:32:43 +00:00 |
|
Yao Chen
|
1462301afc
|
Merge "Fix a UidMap crash." into pi-dev am: 9859c29a8f
am: 6ad129b893
Change-Id: If33d62bf32f60ededcb95587a01309b36c329595
|
2018-03-20 06:29:39 +00:00 |
|
Karthik Ravi Shankar
|
dad15d5c00
|
Merge "Fix the binder calling identity in setVrMode" into pi-dev am: 88757bbb8b
am: 48a8c94e5c
Change-Id: I9b7ea3112037ae4d914f76b2c2952cb096971c92
|
2018-03-20 06:24:53 +00:00 |
|
Alice Sheng
|
20f6e59d58
|
Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev am: 7723aed494
am: 4aa94a7c50
Change-Id: Id2d785bd171e9ef5803b65cb6f4b82ae93005701
|
2018-03-20 06:13:31 +00:00 |
|
Andreas Gampe
|
45c0ef2ca1
|
Merge "Frameworks: Handle exceptions in SystemProperties callbacks" into pi-dev
am: 837f1364f6 -s ours
Change-Id: I8fc2af180b2916f23c41e4d76e143cf96736ea1e
|
2018-03-20 05:50:49 +00:00 |
|
TreeHugger Robot
|
837f1364f6
|
Merge "Frameworks: Handle exceptions in SystemProperties callbacks" into pi-dev
|
2018-03-20 05:37:44 +00:00 |
|
kopriva
|
9c6821025f
|
docs: fixing typo, bug 36909553 am: 4dddc63ee7
am: fdffe0a8be
Change-Id: Ib9c862fc159005c71f4af7c2e8028d588d197a11
|
2018-03-20 05:26:31 +00:00 |
|
Roshan Pius
|
bc03d005e2
|
Merge "Settings: Remove unused bg scan throttle settings" into pi-dev am: f4f317798b
am: 265efbd527 -s ours
Change-Id: I557f1b8f0f8ec1d8f61a8bc1350b35f021639faf
|
2018-03-20 05:16:46 +00:00 |
|
Lucas Dupin
|
f9727309c8
|
Merge "Ease out clock translation" into pi-dev
am: 255352437f
Change-Id: I8585652bf8c5dfd05c74fc0917dd883dc9475cd0
|
2018-03-20 05:15:17 +00:00 |
|
Siyamed Sinir
|
854cc84f93
|
Merge "Fix rounding error related to autoSize" into pi-dev am: 46c84bf237
am: 90d17942e1
Change-Id: I4c66fed37183cba183686c73b92fc651c2f4b1dc
|
2018-03-20 04:59:13 +00:00 |
|
Kweku Adams
|
bd62a2b5ea
|
Merge "Removing the settings-based IncidentReportArgs method." into pi-dev am: 46c0e91b74
am: 148d986e62
Change-Id: Ib8155edff17903fa6bf775c6809498f032ea611d
|
2018-03-20 04:54:20 +00:00 |
|
Jeff Davidson
|
1bccf3e781
|
Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." into pi-dev
am: 2ca77fe976
Change-Id: Ifd1a1fee79b101c566de5fac12a083fdc267da5d
|
2018-03-20 04:43:16 +00:00 |
|
Leon Scroggins III
|
2b0e828b63
|
Merge "Work around incorrect Skia gamma" into pi-dev am: c45c2d65a5
am: 2a23ef3785
Change-Id: I8e70a674fd222070b1782f40b74e5a36b7b141a4
|
2018-03-20 04:41:20 +00:00 |
|
Sunny Goyal
|
1f42bf5b6d
|
Merge "Updating java doc for requestPinAppWidget" into pi-dev
am: dbb0a49f00
Change-Id: I97d558e9dcd3c4e47e7f1e33a7e74e1d1de5aab9
|
2018-03-20 04:35:27 +00:00 |
|
Chavi Weingarten
|
56ffb646c7
|
Merge "Ensure pause when turnScreenOn flag is removed" into pi-dev
am: 211078e1c3
Change-Id: Ie3db2e84ebf21b54645829083c5b88dd2edf8c7d
|
2018-03-20 04:30:29 +00:00 |
|
Winson Chung
|
9dcc7b982b
|
Merge changes I0c466350,I09a9cd43,I8b2a0819 into pi-dev
am: 4cda02f25f
Change-Id: If5e410a3bb21d7188ef0d505d4d03cec1c4c2a74
|
2018-03-20 04:27:09 +00:00 |
|
Chris Tate
|
146c848d5b
|
Merge "Don't ANR if a broadcast recipient is sitting at a breakpoint" into pi-dev
am: 8ada330da7
Change-Id: Ied60bfd78537438ae49b89f2a954002da37e6de2
|
2018-03-20 04:21:29 +00:00 |
|
Lei Yu
|
3e2c262b46
|
Merge "Add metric for battery tip action" into pi-dev
am: 1817c1329f
Change-Id: I3cf8b9686f68c7c5cd8d1701a1daeb63edefe796
|
2018-03-20 04:18:12 +00:00 |
|
kopriva
|
fdffe0a8be
|
docs: fixing typo, bug 36909553
am: 4dddc63ee7
Change-Id: Ib943321651422b55b928b90617145a871a0d0460
|
2018-03-20 04:12:47 +00:00 |
|
Yao Chen
|
6ad129b893
|
Merge "Fix a UidMap crash." into pi-dev
am: 9859c29a8f
Change-Id: I48706f97dd6c75a425c60a3d0b1db314c10418d4
|
2018-03-20 03:55:34 +00:00 |
|
Karthik Ravi Shankar
|
48a8c94e5c
|
Merge "Fix the binder calling identity in setVrMode" into pi-dev
am: 88757bbb8b
Change-Id: I8a2e5818c9fe2f5f37a2c9354f2e08078e40995d
|
2018-03-20 03:50:28 +00:00 |
|
Shuzhen Wang
|
ff1b149443
|
Merge "Camera2: Use Set for physical camera IDs" into pi-dev am: 83c4690f55
am: f1b5a2a866
Change-Id: Ic6624159009c3dc5d312ab27be4aa9ec4e690686
|
2018-03-20 03:43:47 +00:00 |
|
Philip P. Moltmann
|
6811f33642
|
Merge "Add '?' to permission group requests." into pi-dev am: 2594933301
am: b2ee30e969
Change-Id: I1ecc7070f86411a29baeefe4dbe5e3cf11183982
|
2018-03-20 03:38:33 +00:00 |
|
Michael Wright
|
40bc7f22f1
|
Merge "Fix up brightness docs." into pi-dev am: 27fd8bd327
am: ae7a6be2c3
Change-Id: I1aed96bdeca7a3ef37045ae2d85c3ae7bc24602a
|
2018-03-20 03:34:16 +00:00 |
|
Andreas Gampe
|
92fc065cf6
|
Frameworks: Handle exceptions in SystemProperties callbacks
When notifying callbacks, catch thrown exceptions.
(cherry picked from commit 7074e6fd4c)
Bug: 73058952
Test: m
Test: atest SystemPropertiesTest
Merged-In: I1c61e11b833e8ddd30d80b9859b20a9fb3185a33
Change-Id: I1c61e11b833e8ddd30d80b9859b20a9fb3185a33
|
2018-03-19 20:33:49 -07:00 |
|
Lucas Dupin
|
255352437f
|
Merge "Ease out clock translation" into pi-dev
|
2018-03-20 03:31:00 +00:00 |
|
Robert Berry
|
4f78109b5f
|
Merge "Move trusted CA certs to core" into pi-dev am: f679bda843
am: 4d549c21ff
Change-Id: I7329c070aae09104e004d94c53b8d80b85dbbdbf
|
2018-03-20 03:30:36 +00:00 |
|
Jian Jin
|
12a378a262
|
Merge "Added strings used by car keyguard overlay" into pi-dev am: c1e05c4af5
am: 6af78a5aac
Change-Id: I7df9491998fc7dfda8b75fb0722ae9b3dd959967
|
2018-03-20 03:26:45 +00:00 |
|
Alice Sheng
|
4aa94a7c50
|
Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev
am: 7723aed494
Change-Id: Ibc6fb095d97e53b9bd95b58e1fbbb77a92d24145
|
2018-03-20 03:25:22 +00:00 |
|