OSDN Git Service
Christine Franks [Tue, 27 Jun 2017 21:52:12 +0000 (21:52 +0000)]
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
Michal Karpinski [Tue, 27 Jun 2017 21:47:36 +0000 (21:47 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
am:
0d1b1a253a
Change-Id: Idd633c178416ababe623f02327a830939ee769ba
Android Build Merger (Role) [Tue, 27 Jun 2017 21:43:42 +0000 (21:43 +0000)]
Merge "Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312" into oc-dr1-dev
Todd Kennedy [Tue, 27 Jun 2017 21:42:07 +0000 (21:42 +0000)]
Merge "Use content type specified on the command line" into oc-dev
am:
f89bf30312
Change-Id: I2eafecfbf73333541a8b28726dc2af0a456443c0
TreeHugger Robot [Tue, 27 Jun 2017 21:40:53 +0000 (21:40 +0000)]
Merge "Set bolt and plus colors together" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 20:33:23 +0000 (20:33 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 20:30:45 +0000 (20:30 +0000)]
Merge "Use content type specified on the command line" into oc-dev
Shishir Agrawal [Tue, 27 Jun 2017 20:08:04 +0000 (20:08 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
am:
f1b57080a6
Change-Id: I23d69f5d9b27f893f2b8e8c38f021900d5eb83c2
Winson Chung [Tue, 27 Jun 2017 20:03:55 +0000 (20:03 +0000)]
Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev
Bill Yi [Tue, 27 Jun 2017 20:01:46 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a0376f250f -s ours
Change-Id: I5331ee04e4cd08a2280e07c06f973329a3c41ab4
TreeHugger Robot [Tue, 27 Jun 2017 19:57:57 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:51:15 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Shishir Agrawal [Tue, 27 Jun 2017 19:50:37 +0000 (19:50 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:49:03 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:44:47 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Evan Laird [Tue, 27 Jun 2017 19:32:56 +0000 (15:32 -0400)]
Set bolt and plus colors together
Also test to make sure the colors stay the same.
Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug:
62668861
Change-Id: I7d01fd41aeedcb182dc05da8d7b0501a6b5b8539
TreeHugger Robot [Tue, 27 Jun 2017 18:53:45 +0000 (18:53 +0000)]
Merge "Scrim opacity" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 18:46:24 +0000 (18:46 +0000)]
Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 17:45:48 +0000 (17:45 +0000)]
Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev
Shishir Agrawal [Mon, 26 Jun 2017 19:06:03 +0000 (12:06 -0700)]
Supress roaming indications during a carrier network change.
Change-Id: Ib39d229b67374c4ca30c3a2c8c3b0050106733cd
Fixes:
62795179
Test: NetworkControllerSignalTest
Julius D'souza [Tue, 27 Jun 2017 17:20:53 +0000 (17:20 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours
am:
c994b07e98
Change-Id: I8f95bc993be88d219e5a736ac8bbab51bc7e1c36
Julius D'souza [Tue, 27 Jun 2017 17:14:51 +0000 (17:14 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours
am:
1cd816eeac -s ours
Change-Id: I1535c1bc21f6c1eaa00787eb2b26a6085f7b69f7
Julius D'souza [Tue, 27 Jun 2017 17:08:48 +0000 (17:08 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor.
am:
789954fb69 -s ours
Change-Id: I049ea4d9b8a12740d4a62e2224dbd28dcedc72ba
TreeHugger Robot [Tue, 27 Jun 2017 16:59:33 +0000 (16:59 +0000)]
Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 16:53:52 +0000 (16:53 +0000)]
Merge "Enable getting text_color_primary via Java." into oc-dr1-dev
Christine Franks [Tue, 27 Jun 2017 16:13:35 +0000 (09:13 -0700)]
Blacklist Night display settings for testing
Bug:
38352336
Test: runtest --path
core/tests/coretests/src/android/provider/SettingsBackupTest.java -m
secureSettingsBackedUpOrBlacklisted
Change-Id: I9be8b1c0604482cbc59f90edd154ef7c641b3d56
TreeHugger Robot [Tue, 27 Jun 2017 15:47:50 +0000 (15:47 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
Michal Karpinski [Tue, 27 Jun 2017 14:08:57 +0000 (15:08 +0100)]
Fix an NPE when cancelling full backup in BMS#endFullBackup()
Bug:
63000171
Test: it's just a nullcheck that compiles
Change-Id: I90faa5577f2fd656bb4f7b6af39494590a77e3bf
Julius D'souza [Tue, 27 Jun 2017 13:48:51 +0000 (06:48 -0700)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor.
Bug:
62038345
Change-Id: I4b86a1b9ab56f560e863663b9f89195ae1187ab4
Kenny Guy [Tue, 27 Jun 2017 13:04:36 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: I80adc11fae6eb7ed72c1f304a560e2a5c9f93108
TreeHugger Robot [Tue, 27 Jun 2017 12:55:39 +0000 (12:55 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
Bill Yi [Tue, 27 Jun 2017 12:46:48 +0000 (05:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie9db11e5a9cc8bdd0108e749ac785eb5a3664a6f
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 27 Jun 2017 12:28:47 +0000 (12:28 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
Julius D'souza [Tue, 27 Jun 2017 11:30:00 +0000 (11:30 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours
am:
af8e230787
Change-Id: I26adc1561e90d9eeca58bb130c2c137e6fea9f40
Julius D'souza [Tue, 27 Jun 2017 11:25:01 +0000 (11:25 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours
am:
8af046a55e -s ours
Change-Id: I6535c07aaf3a62db028da439ead2172c756ef63f
Julius D'souza [Tue, 27 Jun 2017 11:19:01 +0000 (11:19 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
am:
fef074ad29 -s ours
Change-Id: I9e6702dc1e7f9dd875f39cfa61bccdb9dfe117a1
Bill Yi [Tue, 27 Jun 2017 11:11:21 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I65e9dd68965e710fc1e4d62d939fb6dc438b2e87
Auto-generated-cl: translation import
Julius D'souza [Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
Bill Yi [Tue, 27 Jun 2017 10:54:47 +0000 (03:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I322575b88a771dba57f69e28e3d965e502a7e980
Auto-generated-cl: translation import
Kenny Guy [Mon, 26 Jun 2017 18:13:56 +0000 (19:13 +0100)]
Fix deadlock in NetworkLoggingHandler
Stop NetworkLoggingHandler holding a lock
when calling back into DevicePolicyManagerService.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithTwoUsers
Bug:
62966480
Change-Id: I41c3edca8922008a9d838d71ddcc50883699bc74
Selim Cinek [Tue, 27 Jun 2017 10:00:35 +0000 (10:00 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
am:
06fdcf8a40
Change-Id: Ifba5dcd771b7156f9e12bb1a2b9311241850ba8c
TreeHugger Robot [Tue, 27 Jun 2017 09:54:20 +0000 (09:54 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
Bill Yi [Tue, 27 Jun 2017 06:26:57 +0000 (23:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09c8eec5cefb6b5ebfcc36ef51bbd288d4193822
Auto-generated-cl: translation import
Bryce Lee [Tue, 27 Jun 2017 04:20:35 +0000 (04:20 +0000)]
Merge "Add aborted start result." into oc-dev
am:
8796c20dae
Change-Id: I849ea5bfce87bd6a9264308e40242f6a2026713c
Bryce Lee [Tue, 27 Jun 2017 04:14:20 +0000 (04:14 +0000)]
Merge "Add aborted start result." into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 01:59:24 +0000 (01:59 +0000)]
Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev
Shishir Agrawal [Tue, 27 Jun 2017 01:23:07 +0000 (01:23 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 00:48:33 +0000 (00:48 +0000)]
Merge "Pass calling package to resolution UI." into oc-dr1-dev
Zak Cohen [Tue, 27 Jun 2017 00:22:45 +0000 (17:22 -0700)]
Don't assume device has on screen nav bar in RoundedCorners service.
Bug:
63039412
Test: manual
Change-Id: I9af3e1fb9d831dfb988c88b8ef78a52f2af4bef0
TreeHugger Robot [Mon, 26 Jun 2017 23:49:00 +0000 (23:49 +0000)]
Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev
Makoto Onuki [Mon, 26 Jun 2017 23:31:59 +0000 (23:31 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am:
9f607f4c0b
Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5
Andrew Sapperstein [Mon, 26 Jun 2017 23:28:46 +0000 (16:28 -0700)]
Enable getting text_color_primary via Java.
Bug:
37477506
Test: robotests
Change-Id: Idd3c9cdc2a86c54e49ed817b80cefcda0eb44f6a
Bryce Lee [Mon, 26 Jun 2017 23:27:32 +0000 (16:27 -0700)]
Add aborted start result.
Previously, we were returning START_SUCCESS when ActivityStarter
aborted launching the activity. This hides this activity and makes it
harder to debug.
This CL adds a new start result type to capture this internally.
Bug:
38121026
Test: manual
Test: go/wm-smoke
Change-Id: I97699b22b1eff476724c48db0c29daa0566ad280
TreeHugger Robot [Mon, 26 Jun 2017 23:25:10 +0000 (23:25 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
Ying Xu [Mon, 26 Jun 2017 23:09:55 +0000 (23:09 +0000)]
Merge "Fix the inconsistency of scan status." into oc-dr1-dev
Todd Kennedy [Mon, 26 Jun 2017 22:57:06 +0000 (15:57 -0700)]
Use content type specified on the command line
Bug:
62914247
Test: Manual; query before change and no intents resolved. query after and intent resolved.
Test: sample query command: adb shell cmd package query-activities -a android.intent.action.OPEN_DOCUMENT -c android.intent.category.OPENABLE -t \\*/\\*
Change-Id: Ieadb15bcdebeff01e9b8075932417ba5585de16e
TreeHugger Robot [Mon, 26 Jun 2017 22:48:00 +0000 (22:48 +0000)]
Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev
TreeHugger Robot [Mon, 26 Jun 2017 21:48:58 +0000 (21:48 +0000)]
Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev
Chris Craik [Mon, 26 Jun 2017 21:03:01 +0000 (14:03 -0700)]
Use NativeAllocationRegistry for ColorFilter
Bug:
62994689
Test: bit CtsGraphicsTestCases:*
Change-Id: Icea01fa7d4c6e78f3a93434de64bc8ddfe0c7a0e
Lucas Dupin [Mon, 26 Jun 2017 21:21:16 +0000 (14:21 -0700)]
Scrim opacity
Test: visual
Change-Id: Ie7d95b404c259ad0e3bd375dae2f62c997efa303
Fixes:
63015473
Android Build Merger (Role) [Mon, 26 Jun 2017 20:59:50 +0000 (20:59 +0000)]
Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f" into oc-dr1-dev
Bryce Lee [Mon, 26 Jun 2017 20:59:00 +0000 (20:59 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
am:
61196fef1f
Change-Id: I7f11b4a66def7cb49ba20a4ab4772eea0a25ef16
TreeHugger Robot [Mon, 26 Jun 2017 20:58:23 +0000 (20:58 +0000)]
Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev
Bryce Lee [Mon, 26 Jun 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
Shishir Agrawal [Mon, 26 Jun 2017 19:06:03 +0000 (12:06 -0700)]
Supress roaming indications during a carrier network change.
Change-Id: Ib39d229b67374c4ca30c3a2c8c3b0050106733cd
Fixes:
62795179
Test: NetworkControllerSignalTest
Todd Kennedy [Mon, 26 Jun 2017 20:13:57 +0000 (20:13 +0000)]
Merge "Filter instant apps with different names" into oc-dev
am:
adcc94f160
Change-Id: Ia4d1b58648ceb986b0af014cb6b3a6f6c0b2ce2f
Jason Monk [Mon, 26 Jun 2017 20:12:22 +0000 (20:12 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
am:
aa2286e417
Change-Id: I1364155b6a325653d63c74ab407c787756abb5ca
TreeHugger Robot [Mon, 26 Jun 2017 20:06:19 +0000 (20:06 +0000)]
Merge "Filter instant apps with different names" into oc-dev
TreeHugger Robot [Mon, 26 Jun 2017 19:59:20 +0000 (19:59 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
TreeHugger Robot [Mon, 26 Jun 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Add missing ints to palette" into oc-dr1-dev
Christine Franks [Mon, 26 Jun 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev
Evan Laird [Fri, 23 Jun 2017 20:05:33 +0000 (16:05 -0400)]
Use BatteryMeterDrawableBase as QS icon for Battery Saver
This ensures that QS, Settings, and Status bar all use the same drawable
base so they will always look the same. Battery saver is essentially a
full battery that always shows the power saver iconography.
Test: visual; runtest -x
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug:
62668861
Change-Id: I8a9d5e59c9bb38c0ef794a0ed591195809521f70
Chet Haase [Mon, 26 Jun 2017 18:18:51 +0000 (18:18 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
am:
7b95c932d6
Change-Id: Ie1b08ed95b5182c9d8afb423153568e20ac50fe0
Chet Haase [Mon, 26 Jun 2017 18:07:25 +0000 (18:07 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
Todd Kennedy [Mon, 26 Jun 2017 17:34:41 +0000 (10:34 -0700)]
Filter instant apps with different names
ag/
2447596 introduced a regression that caused instant apps to be
made visible to one another.
Change-Id: I5db9a43f05dd5bec991cc0934b1c9a9406dfade6
Fixes:
62998487
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Jason Monk [Mon, 26 Jun 2017 15:22:21 +0000 (11:22 -0400)]
Fix QS lock screen animation
Now that we have a footer, heights and clippings need to be adjusted
to be more accurate.
- Clip QS within its layout box regardless of its y translation
- Calculate height diffs correctly
Test: visual
Change-Id: Ic46996e342cd1000215aa9256da920a7856bb5a4
Fixes:
62489284
TreeHugger Robot [Mon, 26 Jun 2017 17:32:40 +0000 (17:32 +0000)]
Merge "Add release haptic to nav bar buttons" into oc-dr1-dev
Todd Kennedy [Mon, 26 Jun 2017 17:10:14 +0000 (17:10 +0000)]
Merge "null check before dereference" into oc-dev
am:
df8569787c
Change-Id: I62067d87f75367bb527862d3ac3873b3c94c9b7c
TreeHugger Robot [Mon, 26 Jun 2017 16:59:31 +0000 (16:59 +0000)]
Merge "null check before dereference" into oc-dev
Daniel Nishi [Mon, 26 Jun 2017 16:58:12 +0000 (16:58 +0000)]
Merge "Upstream getApplicationLabel()." into oc-dr1-dev
Sooraj Sasindran [Mon, 26 Jun 2017 16:50:20 +0000 (16:50 +0000)]
Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev
Bryce Lee [Mon, 26 Jun 2017 16:35:24 +0000 (16:35 +0000)]
Revert "Add ActivityInfo logging."
This reverts commit
7e84086387cba189bb0c20f9ed17784840a2904a.
Reason for revert: No Longer needed.
Change-Id: Id6a3c66908a0b7b2e6a666f86f30ce05d3964b4b
Todd Kennedy [Mon, 26 Jun 2017 14:51:54 +0000 (07:51 -0700)]
null check before dereference
Change-Id: I6ae219b68920c160e104b307f60802fd75e705ce
Fixes:
62908319
Test: Manual
Christine Franks [Tue, 13 Jun 2017 22:26:09 +0000 (15:26 -0700)]
Add ACTION_DISMISS_TIMER intent
Bug:
38475809
Test: manual - visual inspection of code
Change-Id: I9e58c9699fc2e6afad38db6b44f2e2b649564327
Chet Haase [Mon, 26 Jun 2017 13:44:57 +0000 (06:44 -0700)]
Fix TimePicker RTL issues
The TimePicker (seen when creating an alarm in the Clock app) has
two bugs in landscape mode:
- The hours/minutes switch places (hours should always be to the left
of minutes, regardless of RTL)
- The layout is completely messed up in 12-hour mode (the radial time picker
does not appear on the screen)
This fix addresses both issues by setting the layoutDirection="ltr"
attribute to force a couple of the layouts to be unaffected in RTL mode.
Specifically, the hours/minutes layout and the overall layout will always be
presented left-to-right.
Bug:
62846484 TimePicker layout is broken in RTL landscape mode
Test: manual (tested with/without fix in normal, forded-RTL mode, and
with Hebrew as the first locale).
Change-Id: I8ef3f2706660f60c162ba3d324a18b8f370f67f8
Richard Uhler [Fri, 23 Jun 2017 15:54:25 +0000 (16:54 +0100)]
Fix bug in reporting SwapPss in dumpsys meminfo.
Bug:
29875093
Test: Run dumpsys meminfo -a, verify SwapPss adds up and is non-zero
for dalvik and native.
Change-Id: I79d0b6a59bf5f4e73f75f0b9540ec0fcc9e23b02
TreeHugger Robot [Sun, 25 Jun 2017 01:26:41 +0000 (01:26 +0000)]
Merge "Consider double tap of the play/pause as the next track" into oc-dr1-dev
TreeHugger Robot [Sat, 24 Jun 2017 04:44:05 +0000 (04:44 +0000)]
Merge "Protect a11y against multi-threaded UIs" into oc-dr1-dev
Jean-Michel Trivi [Sat, 24 Jun 2017 01:28:41 +0000 (18:28 -0700)]
Do not duck AAudio streams as a result of focus loss
Not all AAudio streams support VolumeShaper, so do not have
the framework duck AAudio players in audio focus management.
Test: play audio through AAudio and play notification
Bug:
62027849
Change-Id: Ibe7293bf2347b75c8abd2194b6863ee3f5944003
Daniel Sandler [Sat, 24 Jun 2017 02:03:02 +0000 (02:03 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
am:
7fce51594e
Change-Id: I706b0ed179cad649cbcdbe2dee7c621852bd024e
TreeHugger Robot [Sat, 24 Jun 2017 01:58:32 +0000 (01:58 +0000)]
Merge "AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL" into oc-dr1-dev
Daniel Sandler [Sat, 24 Jun 2017 01:50:34 +0000 (01:50 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
Jean-Michel Trivi [Sat, 24 Jun 2017 01:39:16 +0000 (01:39 +0000)]
Merge "Total Silence vs VoIP" into oc-dr1-dev
Wale Ogunwale [Sat, 24 Jun 2017 01:35:55 +0000 (01:35 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
am:
0b138595de
Change-Id: Icaaaca9735c18d10dcb414c82d2b6833c95ab6e9
TreeHugger Robot [Sat, 24 Jun 2017 01:21:39 +0000 (01:21 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
Selim Cinek [Sat, 24 Jun 2017 00:55:46 +0000 (00:55 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
am:
9bf5c0c3e1
Change-Id: I9f1dc8c2c6d2ad461efc2722a5b1829f753dfcd4
Selim Cinek [Sat, 24 Jun 2017 00:44:08 +0000 (00:44 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
Etan Cohen [Sat, 24 Jun 2017 00:36:50 +0000 (00:36 +0000)]
Merge "[P2P] Eliminate separate storage of binders - a memory leak" into oc-dr1-dev
Selim Cinek [Sat, 24 Jun 2017 00:22:38 +0000 (17:22 -0700)]
Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.
Test: manual inspection
Fixes:
62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
Bryce Lee [Fri, 23 Jun 2017 23:53:33 +0000 (23:53 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
am:
4b6219dab3
Change-Id: I6b4ac6518fab138ffa3b218e9471149018fb1f34