OSDN Git Service
Evan Laird [Fri, 14 Jul 2017 21:25:05 +0000 (21:25 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
am:
ed4d5fc925
Change-Id: I7f97967d9cb7c6131489ab7202734c24e4076d2a
TreeHugger Robot [Fri, 14 Jul 2017 21:16:44 +0000 (21:16 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
Wei Wang [Fri, 14 Jul 2017 20:56:13 +0000 (20:56 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
am:
cf70671a75
Change-Id: Ib7e61f66b52525d59fc8fe111124b859ddc52e04
Wei Wang [Fri, 14 Jul 2017 20:42:23 +0000 (20:42 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
Lucas Dupin [Fri, 14 Jul 2017 20:31:33 +0000 (20:31 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev
am:
8d5b831095
Change-Id: I8ced4304e4e6f6f766c7160e25122974ec0c9548
TreeHugger Robot [Fri, 14 Jul 2017 20:24:37 +0000 (20:24 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 20:19:02 +0000 (20:19 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev-plus-aosp
Jeff Davidson [Fri, 14 Jul 2017 20:07:26 +0000 (20:07 +0000)]
Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev
am:
c0ce489df7
Change-Id: Iea42444468b78c604f32ffd4a47eb8a1c762d2ab
Evan Laird [Fri, 14 Jul 2017 19:59:53 +0000 (19:59 +0000)]
Merge "Round mobile icon slash and fix color" into oc-dr1-dev
am:
2809c2fb0b
Change-Id: I93d2f84f98d65708d40bf58d8760e1a8d4a52d51
Jeff Davidson [Fri, 14 Jul 2017 19:54:52 +0000 (19:54 +0000)]
Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:49:00 +0000 (19:49 +0000)]
Merge "Round mobile icon slash and fix color" into oc-dr1-dev
Jesse Hall [Fri, 14 Jul 2017 19:40:45 +0000 (19:40 +0000)]
Merge "Preload app-process HALs in Zygote" into oc-dr1-dev
am:
61d1af5746
Change-Id: I2b51bd19d1fde7fc8e0e1cc9de71a3cd5d1a7ef9
Jason Monk [Fri, 14 Jul 2017 19:35:18 +0000 (19:35 +0000)]
Merge "Fix crash in monodroid apps" into oc-dr1-dev
am:
3d80a73350
Change-Id: If80299af64fac8138e4cf9b681ebed13e09b8ccf
TreeHugger Robot [Fri, 14 Jul 2017 19:33:26 +0000 (19:33 +0000)]
Merge "Preload app-process HALs in Zygote" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:26:43 +0000 (19:26 +0000)]
Merge "Fix crash in monodroid apps" into oc-dr1-dev
Wei Wang [Fri, 14 Jul 2017 18:39:30 +0000 (11:39 -0700)]
SystemServiceManager: Change from wall time to boottiime
elapsedRealtime is milliseconds since boot, including time spent in sleep
Bug:
63707383
Test: Build
Change-Id: I7db77565f2af6277f05400398044fad297872ea4
Lucas Dupin [Fri, 14 Jul 2017 18:21:30 +0000 (18:21 +0000)]
Merge "Do not reload bitmap unless necessary" into oc-dr1-dev
am:
c4c5d60607
Change-Id: I8985bfe8ed4a0067877ed042e256ecfa67ed5682
TreeHugger Robot [Fri, 14 Jul 2017 18:15:19 +0000 (18:15 +0000)]
Merge "Do not reload bitmap unless necessary" into oc-dr1-dev
Evan Laird [Fri, 14 Jul 2017 17:29:49 +0000 (13:29 -0400)]
Round mobile icon slash and fix color
Airplane mode slashed mobile signal icon should be rounded. Also it was
drawing in the foreground color instead of background. That was bad.
Test: visual
Change-Id: Ie7137929e1b54118482b0990e3d86ccb0f620e56
Fixes:
63533582
Eino-Ville Talvala [Fri, 14 Jul 2017 17:26:49 +0000 (17:26 +0000)]
Merge changes from topic 'camera-tron' into oc-dr1-dev
am:
280165118d
Change-Id: Ic163d728471cb1cdb7dfc60955452a0f1491dc76
Jason Monk [Fri, 14 Jul 2017 14:22:36 +0000 (10:22 -0400)]
Fix crash in monodroid apps
Don't getApplicationContext if we already have an application.
Test: launch a monodroid app
Change-Id: I0c1558463053de3db0f1cd4693088e7c639ce5fa
Fixes:
63666480
Jeff Davidson [Fri, 14 Jul 2017 16:46:19 +0000 (09:46 -0700)]
Temporarily disable eUICC factory reset handling.
This seems to be causing users who elect not to wipe their eUICC on a
factory reset to end up on the eSIM slot after the reset instead of
the pSIM slot.
Bug:
63693573
Test: TreeHugger + factory reset local test
Change-Id: I414a16cde11e76ccc390e7a63a6803f5b402fe78
TreeHugger Robot [Fri, 14 Jul 2017 17:17:47 +0000 (17:17 +0000)]
Merge changes from topic 'camera-tron' into oc-dr1-dev
* changes:
CameraServiceProxy: Log camera usage metrics
CameraServiceProxy: Add CameraStatsLoggingService, event dumping
Adrian Roos [Fri, 14 Jul 2017 17:14:27 +0000 (17:14 +0000)]
Merge "AOD: Show date on always-on display" into oc-dr1-dev
am:
3fbe9d737a
Change-Id: I5fafed2ee739358c206e53adc08dcf25a6675560
TreeHugger Robot [Fri, 14 Jul 2017 17:05:27 +0000 (17:05 +0000)]
Merge "AOD: Show date on always-on display" into oc-dr1-dev
Lucas Dupin [Thu, 6 Jul 2017 23:09:24 +0000 (16:09 -0700)]
Move palette constants to XML
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Change-Id: I22a5ef9b89c113f75261e8884fa1affb07b2265f
Fixes:
62373429
Adrian Roos [Fri, 14 Jul 2017 16:00:22 +0000 (16:00 +0000)]
Merge "AOD: Refactor low and high brightness modes" into oc-dr1-dev
am:
930297e040
Change-Id: I7fce673716a81aaadcfc24eaa6af61e14348c1e1
TreeHugger Robot [Fri, 14 Jul 2017 15:49:57 +0000 (15:49 +0000)]
Merge "AOD: Refactor low and high brightness modes" into oc-dr1-dev
Julia Reynolds [Fri, 14 Jul 2017 13:49:13 +0000 (13:49 +0000)]
Merge "Fix system crash" into oc-dr1-dev
am:
5a0958ed0b
Change-Id: Icd087a48c50670bc5a59c34a13ecb3df5d5529e2
TreeHugger Robot [Fri, 14 Jul 2017 13:40:44 +0000 (13:40 +0000)]
Merge "Fix system crash" into oc-dr1-dev
Adrian Roos [Thu, 13 Jul 2017 17:55:38 +0000 (19:55 +0200)]
AOD: Refactor low and high brightness modes
Bug:
63427319
Test: Receive notification on AOD, observe that brightness does not change.
Change-Id: I6ab6d75121f51ac16c08e59a3e552808a8e70853
Adrian Roos [Wed, 12 Jul 2017 17:15:59 +0000 (19:15 +0200)]
AOD: Show date on always-on display
Test: Turn off display. Make sure date shows on AOD. Also make sure it works with a white wallpaper.
Fixes:
63528250
Change-Id: I82e0e579f351c5f145021d0b3759f79c11a1270e
TreeHugger Robot [Fri, 14 Jul 2017 09:50:59 +0000 (09:50 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
(cherry pick from commit
22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into oc-dr1-dev-plus-aosp because of previous
cherry picks and incorrect Merged-In annotations)
Change-Id: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
Eino-Ville Talvala [Fri, 14 Jul 2017 05:49:45 +0000 (05:49 +0000)]
Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev
am:
0c0fd0375c
Change-Id: I1d67c1f2cdaa28063110454592cf7306ecb7bcd2
TreeHugger Robot [Fri, 14 Jul 2017 05:41:34 +0000 (05:41 +0000)]
Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev
Naveen Kalla [Fri, 14 Jul 2017 03:43:21 +0000 (20:43 -0700)]
resolve merge conflicts of
b78661052c44 to oc-dr1-dev-plus-aosp
Bug:
62933474
Test: Build
Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
TreeHugger Robot [Fri, 14 Jul 2017 02:54:59 +0000 (02:54 +0000)]
Merge "Convert CDMA caller ID codes while roaming on 3GPP networks" into oc-dr1-dev
Hall Liu [Fri, 14 Jul 2017 02:54:29 +0000 (02:54 +0000)]
Merge "Clean up streaming API docs and organize errors" am:
d2c8dcfcfe am:
d98024a1f9
am:
f83fb827a7
Change-Id: I90910fd62a74d7518d69c409eeb6cc8f4a7bb6f2
Hall Liu [Fri, 14 Jul 2017 02:48:17 +0000 (02:48 +0000)]
Merge "Clean up streaming API docs and organize errors" am:
d2c8dcfcfe
am:
d98024a1f9
Change-Id: I917a65a35bc607cdc9b820ac55a98d6bfab1b782
Hall Liu [Fri, 14 Jul 2017 02:43:10 +0000 (02:43 +0000)]
Merge "Clean up streaming API docs and organize errors"
am:
d2c8dcfcfe
Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab
Treehugger Robot [Fri, 14 Jul 2017 02:32:21 +0000 (02:32 +0000)]
Merge "Clean up streaming API docs and organize errors"
Lorenzo Colitti [Fri, 14 Jul 2017 01:01:29 +0000 (01:01 +0000)]
Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev
am:
3756636ad6
Change-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
Lorenzo Colitti [Fri, 14 Jul 2017 00:51:56 +0000 (00:51 +0000)]
Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev
* changes:
Add code to dump OffloadController state.
Fetch tethering offload stats.
Allow more than one source of tethering statistics.
Android Build Merger (Role) [Fri, 14 Jul 2017 00:48:52 +0000 (00:48 +0000)]
Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am:
dd74c1a8cd" into oc-dr1-dev-plus-aosp
Roozbeh Pournader [Fri, 14 Jul 2017 00:47:51 +0000 (00:47 +0000)]
Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev
am:
dd74c1a8cd
Change-Id: I23c2927e8281cb00f4d0fef8c83bcdebb2f682c7
Hugo Benichi [Fri, 14 Jul 2017 00:46:49 +0000 (00:46 +0000)]
resolve merge conflicts of
4f2a0fe213e5 to stage-aosp-master am:
a428392c1d
am:
164ff8a2ed
Change-Id: I08195e119f866acc9fe1795b892fe45cea3c7f47
Hugo Benichi [Fri, 14 Jul 2017 00:37:20 +0000 (00:37 +0000)]
resolve merge conflicts of
4f2a0fe213e5 to stage-aosp-master
am:
a428392c1d
Change-Id: Ide67520d074330ec050ded71118bff0bc88be784
TreeHugger Robot [Fri, 14 Jul 2017 00:36:22 +0000 (00:36 +0000)]
Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev
Siqi Lin [Fri, 14 Jul 2017 00:03:46 +0000 (00:03 +0000)]
Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev
am:
d0b2c3b28c
Change-Id: If06d96e09251c6de129c978f939f2206cbcda2d4
Siqi Lin [Thu, 13 Jul 2017 23:56:05 +0000 (23:56 +0000)]
Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev
David Lin [Thu, 13 Jul 2017 23:20:48 +0000 (23:20 +0000)]
Merge "Fix issue with double vibration trigger" into oc-dr1-dev
am:
f34b4633bd
Change-Id: Iaa872f5a6990f01dd832f48c88a3fc4625a89063
TreeHugger Robot [Thu, 13 Jul 2017 23:14:31 +0000 (23:14 +0000)]
Merge "Fix issue with double vibration trigger" into oc-dr1-dev
Peng Xu [Thu, 13 Jul 2017 23:08:07 +0000 (23:08 +0000)]
Merge "Add sensor HAL process into dump list" into oc-dr1-dev
am:
2098c83afb
Change-Id: I4c46791379775c9fee08df41d38c9cfb0fa1775e
TreeHugger Robot [Thu, 13 Jul 2017 23:01:11 +0000 (23:01 +0000)]
Merge "Add sensor HAL process into dump list" into oc-dr1-dev
Hugo Benichi [Thu, 13 Jul 2017 22:25:51 +0000 (07:25 +0900)]
resolve merge conflicts of
4f2a0fe213e5 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031
Roozbeh Pournader [Thu, 13 Jul 2017 22:19:45 +0000 (15:19 -0700)]
Make TextInputTimePickerView use localized input
Previously, TextInputTimePickerView used the default numeric IME, which
could result in cases where the digits displayed in the text fields were
native, but the IME showed ASCII digits resulting in a mix.
Now we use setImeHintLocales to hint that we need a localized IME.
Change-Id: Ic4041dcc65a31bd00741c6d96d8cbc5dac9d77c8
Fixes:
63650251
Test: Manual (tested under en-US and ar-BH locales)
Lucas Dupin [Thu, 13 Jul 2017 22:19:27 +0000 (15:19 -0700)]
Do not reload bitmap unless necessary
Let's just wait until the current async task finishes,
the engine will be recreated if the bitmap changes.
Test: Set wallpaper, no black frame
Change-Id: Icad8c18095119e9e035efc04704bc6d2d35af6d9
Fixes:
63065764
Naveen Kalla [Wed, 12 Jul 2017 03:03:58 +0000 (20:03 -0700)]
Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.
Bug:
62933474
Test: Simulate Roaming scenario and ensure that the dial
string is converted as expected.
Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
Philip Cuadra [Wed, 12 Jul 2017 00:01:06 +0000 (17:01 -0700)]
Use new powerHintAsync when available
Use the async version of powerHint when available.
Bug:
62377008
Test: Run systrace, confirm powerHints are async HIDL transactions
Change-Id: I3bb4022b78d380b054bf13008bb8b0d399bf1955
Siqi Lin [Thu, 13 Jul 2017 21:04:13 +0000 (14:04 -0700)]
BootReceiver: Remove error log when last-header.txt is missing
It's normal for /data/system/last-header.txt to not exist on
the first boot after factory reset. The code already handles
this case properly so the Slog.e is just noise that shows up
in bugreports.
Bug:
37513804
Test: manual - boot after factory reset, check logcat
Change-Id: I1c8e3437cdbda5e04c0299764c7e4921bef67cb3
Doris Ling [Thu, 13 Jul 2017 21:15:21 +0000 (21:15 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
am:
9f675cee28
Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f
TreeHugger Robot [Thu, 13 Jul 2017 20:59:39 +0000 (20:59 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
Treehugger Robot [Thu, 13 Jul 2017 20:45:21 +0000 (20:45 +0000)]
Merge "IpManager: define InitialConfiguration"
David Lin [Thu, 13 Jul 2017 19:20:44 +0000 (12:20 -0700)]
Fix issue with double vibration trigger
This patch fixes an issue that cause duplicated calls to HAL even when
the first call succeeded.
Bug:
63667425
Test: manual test
Change-Id: I4c29e3c9872cc42ea143b3adda3a3defca728e71
Jorim Jaggi [Thu, 13 Jul 2017 20:20:27 +0000 (20:20 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev
am:
be1577ae59
Change-Id: If8fea9defc84fcd3f7f8f2c98dcb00f13f7ffffc
Jorim Jaggi [Thu, 13 Jul 2017 20:13:33 +0000 (20:13 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev
Nikolas Bravo [Thu, 13 Jul 2017 20:05:55 +0000 (20:05 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
am:
479d915db5
Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b
TreeHugger Robot [Thu, 13 Jul 2017 19:59:40 +0000 (19:59 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
Christopher Tate [Thu, 13 Jul 2017 19:56:56 +0000 (19:56 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev
am:
47303ec66b
Change-Id: Id831cef2f90ad39537975d31407f00b2f768d59e
Lucas Dupin [Thu, 13 Jul 2017 19:49:59 +0000 (19:49 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
am:
6a6d63be45
Change-Id: Ia0425e5333b437970786255b0a1e513fedfcf0bd
TreeHugger Robot [Thu, 13 Jul 2017 19:49:28 +0000 (19:49 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 19:41:32 +0000 (19:41 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
* changes:
Check mark color after successful auth
Ripple colors should match sysui theme.
Correct navbar colors after rebooting
Timur Iskhakov [Thu, 13 Jul 2017 19:33:29 +0000 (19:33 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547 am:
791a698a6a
am:
9cdec3943c
Change-Id: Id3e2523a755e8ce207ac6bd85dbf6d5a69070207
Timur Iskhakov [Thu, 13 Jul 2017 19:27:37 +0000 (19:27 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547
am:
791a698a6a
Change-Id: I9b98013a894aa01268ed69a14c6b425e04771936
Hugo Benichi [Fri, 23 Jun 2017 01:07:08 +0000 (10:07 +0900)]
IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.
At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.
This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
1) easy extensibility for new test case,
2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.
Bug:
62988545
Test: added new test in FrameworksNetTests,
$ runtest frameworks-net
$ runtest frameworks-wifi
Merged-In: I060b02603af7d73a6407df89344bf0c000574af2
(cherry pick of commit
2757fcf3a13b0addc4a168a12c72ac2fc418b012)
Change-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53
Eino-Ville Talvala [Thu, 13 Jul 2017 19:07:20 +0000 (12:07 -0700)]
CameraManager: Handle camera service being disabled explicitly
Previously, CameraManager handled a disabled camera service
implicitly, the same as it handles a temporarily-crashed camera
service.
However, the error reporting for the those cases isn't really the
same, so switch to being explicit - check for the disabled camera
service system property, and if it's set, short-circuit calls.
Test: Camera CTS continues to pass, Watch device with no camera
service also now passes camera CTS.
Bug:
62269118
Change-Id: I65a97f8c1b0f101999b2c04d4f1096b7f3aee858
Timur Iskhakov [Thu, 13 Jul 2017 19:21:42 +0000 (19:21 +0000)]
Merge "Add configureRpcThreadpool to java interface"
am:
d8dab11547
Change-Id: I958ef6fc2d667a691e39e9fadd07303085a499f9
Julia Reynolds [Thu, 13 Jul 2017 19:15:54 +0000 (19:15 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
am:
bcc35f5ae6
Change-Id: Ifb65c3b9aba091a30f6b895bd2c5f585802cf150
Treehugger Robot [Thu, 13 Jul 2017 19:11:39 +0000 (19:11 +0000)]
Merge "Add configureRpcThreadpool to java interface"
Qingxi Li [Thu, 13 Jul 2017 19:08:27 +0000 (19:08 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
am:
b7febbb727
Change-Id: Ia16b14971d474bdab739368a83b5b119faeaa381
TreeHugger Robot [Thu, 13 Jul 2017 19:03:48 +0000 (19:03 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
Qingxi Li [Thu, 13 Jul 2017 19:02:24 +0000 (19:02 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 19:00:21 +0000 (19:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e210bf7a40 -s ours
Change-Id: I5ae2c4e17952f0f5ca5cea8255fa2d68647c6dab
TreeHugger Robot [Thu, 13 Jul 2017 18:53:12 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Evan Laird [Thu, 13 Jul 2017 18:45:23 +0000 (18:45 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
am:
31ff02ecd2
Change-Id: I86b352ed009cf2889974d724a4cf8daf41fb61d7
TreeHugger Robot [Thu, 13 Jul 2017 18:39:39 +0000 (18:39 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 18:34:30 +0000 (18:34 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
am:
fa62d79a02
Change-Id: Iaff54dcb133a4169f70f7ea2d7ded68cc313e946
Bryce Lee [Thu, 13 Jul 2017 18:28:09 +0000 (18:28 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
Eino-Ville Talvala [Mon, 10 Jul 2017 23:23:50 +0000 (16:23 -0700)]
CameraServiceProxy: Log camera usage metrics
- Add new events for camera usage by camera facing
- Dump stored camera events into metrics logs
- Shuffle event ordering for privacy
- Limit history to 100 entries at most
Test: Verify event log collection includes camera events
Bug:
32449509
Change-Id: I2e80b84f9bba3691893dca653ac085fef0b6c98c
Eino-Ville Talvala [Mon, 10 Jul 2017 22:27:24 +0000 (15:27 -0700)]
CameraServiceProxy: Add CameraStatsLoggingService, event dumping
- Collect camera usage events (facing, client, duration)
- Create a JobService that triggers roughly daily to dump events
Test: Verify that 'adb shell cmd jobscheduler run android
13254266'
prints out all camera usage since last run
Bug:
32449509
Change-Id: I13172e6e68f5cdb94685a112c74d270d1dda45bf
Paul McLean [Thu, 13 Jul 2017 18:00:55 +0000 (18:00 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
am:
84a60bf9e8
Change-Id: Ica095cfa4d341916fdb3ab1f9948c693c9471733
Nikolas Bravo [Mon, 10 Jul 2017 11:06:34 +0000 (12:06 +0100)]
ProfileSelectDialog no longer removes caller activity from
task.
In Settings, after calling ProfileSelectDialog and choosing a profile,
then going back would go 2 activities back. The issue is that
ProfileSelectDialog was calling finish() in the no-longer-used
SettingsDrawerActivity. This caused the any activity calling the
dialog to be removed from the task, and thus being impossible to
go back to. This call to the drawer is also a code smell.
Bug:
36237246
Fixes:
36237246
Test: NA
Change-Id: I6f309b220ffae1d86e6879ddf6a0305ad3dde3e8
(cherry picked from commit
b975c0e44445f76d67e7576c1e8e08609b696408)
Selim Cinek [Thu, 13 Jul 2017 17:54:13 +0000 (17:54 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
am:
c8c121757e
Change-Id: I796e63264ddbba810a1def709594fa73977f50ca
TreeHugger Robot [Thu, 13 Jul 2017 17:48:23 +0000 (17:48 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:47:52 +0000 (17:47 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
am:
a926dbf5d2
Change-Id: I3f1dd4938ed37af093d326a951b9eb1854e60611
Doris Ling [Fri, 30 Jun 2017 23:04:56 +0000 (16:04 -0700)]
Update the max height/width attribute of the TwoTargetPreference icon.
Change the namespace for the icon image view to settings package.
Change-Id: Id1ffbc1742bedab93c9f03e9d464f532fe2c33af
Fix:
63666970
Test: Visual
(cherry picked from commit
a990b5da04b4f5d475ff038f99d7dd908e931d63)
TreeHugger Robot [Thu, 13 Jul 2017 17:40:44 +0000 (17:40 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:38:48 +0000 (17:38 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 17:09:59 +0000 (17:09 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
am:
717dd58c52
Change-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e