OSDN Git Service
Jorim Jaggi [Fri, 19 May 2017 00:41:19 +0000 (00:41 +0000)]
Merge "Optimize latency when closing panel with animation" into oc-dev am:
6c0aba7d4f
am:
8f1511e91a
Change-Id: I3a34ff4e1214836bf7250f2ade2ae4e8108a65f1
Jorim Jaggi [Fri, 19 May 2017 00:32:43 +0000 (00:32 +0000)]
Merge "Optimize latency when closing panel with animation" into oc-dev
am:
6c0aba7d4f
Change-Id: I14488940604c73345ec559bacb1cc7e2cf272ca5
Jorim Jaggi [Fri, 19 May 2017 00:24:12 +0000 (00:24 +0000)]
Merge "Optimize latency when closing panel with animation" into oc-dev
Bill Yi [Fri, 19 May 2017 00:13:11 +0000 (00:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
d4c3c6e1b1 -s ours
am:
ea87948cf9 -s ours
Change-Id: I6f2179a7f1228a883121c89ec6fc0d6c7dcd2c77
Bill Yi [Fri, 19 May 2017 00:08:41 +0000 (00:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
75e1c53fa8 -s ours
am:
f332b5dfc8 -s ours
Change-Id: I339f5526d50023f54537322ff34a5cb20824bfed
Bill Yi [Fri, 19 May 2017 00:01:37 +0000 (00:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 18 May 2017 23:59:17 +0000 (23:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d4c3c6e1b1 -s ours
Change-Id: I3d2ad4363209ff05fc2dd5f50f0173ff6c748902
Bill Yi [Thu, 18 May 2017 23:58:24 +0000 (23:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Ahmed ElArabawy [Thu, 18 May 2017 23:57:18 +0000 (23:57 +0000)]
Merge "Revert "power hal: Use power HAL API 1.1""
Bill Yi [Thu, 18 May 2017 23:56:47 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
75e1c53fa8 -s ours
Change-Id: I09b7d1b6e45a95538eb722e95c7a7da22f55ce6b
Seigo Nonaka [Thu, 18 May 2017 23:54:24 +0000 (23:54 +0000)]
Merge "Introduce early exit path for non resource path." into oc-dev am:
01d5b3d2af
am:
99c587a9b1
Change-Id: I7e09b074f7fff0f273ca2be896439bae0c0c92d0
TreeHugger Robot [Thu, 18 May 2017 23:47:31 +0000 (23:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Winson Chung [Thu, 18 May 2017 23:42:55 +0000 (23:42 +0000)]
Merge "Workaround issue with pip overlay not hiding cleanly." into oc-dev am:
99a885b5d6
am:
7289c0a98e
Change-Id: I47bbb909d172c7d65034676076142ec02af8dbae
Winson Chung [Thu, 18 May 2017 23:40:27 +0000 (23:40 +0000)]
Merge "Fixing issue with double tapping PiP." into oc-dev am:
39d9ae20a6
am:
6e566cda48
Change-Id: Iec63ad801044b22c017427b4d1e160432606e9b3
Seigo Nonaka [Thu, 18 May 2017 23:39:41 +0000 (23:39 +0000)]
Merge "Introduce early exit path for non resource path." into oc-dev
am:
01d5b3d2af
Change-Id: I07120a86307dd397862e0d341763d0048b066845
TreeHugger Robot [Thu, 18 May 2017 23:30:08 +0000 (23:30 +0000)]
Merge "Introduce early exit path for non resource path." into oc-dev
Winson Chung [Thu, 18 May 2017 23:29:36 +0000 (23:29 +0000)]
Merge "Workaround issue with pip overlay not hiding cleanly." into oc-dev
am:
99a885b5d6
Change-Id: I867ea37ccf803f8e43b2a2a1c2b5099f2711a4d8
Winson Chung [Thu, 18 May 2017 23:26:20 +0000 (23:26 +0000)]
Merge "Fixing issue with double tapping PiP." into oc-dev
am:
39d9ae20a6
Change-Id: Ibf0a355d5b171e360599620ce90aa7aee127e835
Winson Chung [Thu, 18 May 2017 23:15:27 +0000 (23:15 +0000)]
Merge "Workaround issue with pip overlay not hiding cleanly." into oc-dev
Winson Chung [Thu, 18 May 2017 23:14:54 +0000 (23:14 +0000)]
Merge "Fixing issue with double tapping PiP." into oc-dev
Jorim Jaggi [Thu, 18 May 2017 22:47:12 +0000 (22:47 +0000)]
Merge "Fix ordering of notifying dismiss callback" into oc-dev am:
e85f8eb0ca
am:
a55a662600
Change-Id: Ic24eaca241ddc2c84395a1d2bdaf6dd554b0e55b
Jorim Jaggi [Thu, 18 May 2017 22:39:08 +0000 (22:39 +0000)]
Merge "Fix ordering of notifying dismiss callback" into oc-dev
am:
e85f8eb0ca
Change-Id: Ia851bbedb5fc429ea05eb0b1eaa5cbcddec7b961
Jorim Jaggi [Thu, 18 May 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Fix ordering of notifying dismiss callback" into oc-dev
Stan Iliev [Thu, 18 May 2017 22:11:41 +0000 (22:11 +0000)]
Merge "Fix a crash in Canvas.drawBitmap if empty dest rect is passed"
Jorim Jaggi [Tue, 16 May 2017 12:23:19 +0000 (14:23 +0200)]
Optimize latency when closing panel with animation
The interpolator we chose had a very slow easy out where it
generated out frame with mExpandedHeight=0.3 pixels. We add a
check there and stop the animation immediately if this happens.
Furthermore, we just use a simple post when closing the panel
to not add to much latency. The frame will be shown in any case
since we are already in animation/input callback, such that a post
will be executed after the frame has been sent to RT.
Test: Capture trace, unlock phone, make sure no delays
Change-Id: I9fc45f4b081bd6143da1ba99e9bc652a9f64e4a7
Fixes:
38294347
Calin Juravle [Thu, 18 May 2017 21:42:45 +0000 (21:42 +0000)]
Merge "Also pin vdex file for camera" am:
d4ae914be2 am:
a433a9d9f4 am:
d7a40aced2
am:
d2eb85f5c8
Change-Id: Ia6fa6e66c9d104cc6b274f885e8d2a5ff8d0e721
Calin Juravle [Thu, 18 May 2017 21:29:46 +0000 (21:29 +0000)]
Merge "Also pin vdex file for camera" am:
d4ae914be2 am:
a433a9d9f4
am:
d7a40aced2
Change-Id: I682843c8b76fc7249d6210aad2b344e463c8966a
Calin Juravle [Thu, 18 May 2017 21:21:11 +0000 (21:21 +0000)]
Merge "Also pin vdex file for camera" am:
d4ae914be2
am:
a433a9d9f4
Change-Id: I943815b1e8b29734224d49140a667bf4d7d23b8f
Calin Juravle [Thu, 18 May 2017 21:12:05 +0000 (21:12 +0000)]
Merge "Also pin vdex file for camera"
am:
d4ae914be2
Change-Id: I0d1a687ea2d90e968fe4e9705de223dc8b181238
Bill Yi [Thu, 18 May 2017 21:05:59 +0000 (14:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50fea21ca95688f8c59dba0ffda049f7551b8c5e
Auto-generated-cl: translation import
Calin Juravle [Thu, 18 May 2017 21:03:48 +0000 (21:03 +0000)]
Merge "Also pin vdex file for camera"
Bill Yi [Thu, 18 May 2017 20:31:33 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f27fb2b66c1727413b8f33155b41d393c173144
Auto-generated-cl: translation import
Bill Yi [Thu, 18 May 2017 20:26:57 +0000 (20:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a239ed1c79 -s ours
am:
cfb3693fd8 -s ours
Change-Id: I6442efdc972861973d0330774b2f04503dc1c2e6
Bill Yi [Thu, 18 May 2017 20:18:53 +0000 (20:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a239ed1c79 -s ours
Change-Id: Ic6c5ebc4242cdf2033a0fd272b842de1f482b396
TreeHugger Robot [Thu, 18 May 2017 20:10:29 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Todd Kennedy [Thu, 18 May 2017 19:54:38 +0000 (19:54 +0000)]
Merge "don't dex when installing an instant app" into oc-dev am:
d5f3bd46a1
am:
ec7cd6dbbe
Change-Id: I70a7876ea219ab9e8503be9dcb4ff7349a3941eb
Todd Kennedy [Thu, 18 May 2017 19:51:53 +0000 (19:51 +0000)]
Merge "Filter package related info" into oc-dev am:
72b7b1f001
am:
36482247ea
Change-Id: I8b5a7d1c08e7d6f822347aaed2b15e4e270d0a49
Yipeng Cao [Thu, 18 May 2017 19:45:29 +0000 (19:45 +0000)]
Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev am:
b42205ee9e
am:
ad17fd8fda -s ours
Change-Id: I1481aed438cc531a304acad6e50893ba74c67a35
Todd Kennedy [Thu, 18 May 2017 19:45:12 +0000 (19:45 +0000)]
Merge "don't dex when installing an instant app" into oc-dev
am:
d5f3bd46a1
Change-Id: Ia27a62acce14f8dbce07ceef942f0059ed8875cc
Todd Kennedy [Thu, 18 May 2017 19:42:52 +0000 (19:42 +0000)]
Merge "Filter package related info" into oc-dev
am:
72b7b1f001
Change-Id: Iaf388732140d5e3d134c9a60db459410ad6a944c
Roozbeh Pournader [Thu, 18 May 2017 19:42:51 +0000 (19:42 +0000)]
Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev am:
99e620ef32
am:
c9affff74c
Change-Id: I3501e9a7174b5e1ab8a9486710de515a605f5eb7
Stan Iliev [Thu, 18 May 2017 18:21:23 +0000 (14:21 -0400)]
Fix a crash in Canvas.drawBitmap if empty dest rect is passed
Fix a crash in Canvas.drawBitmap if an empty dest or source rect
is passed. This issue is specific to Skia pipeline only.
Test: Ran hwui unit tests and verified nexuslauncher is not
crashing anymore.
Change-Id: I3f9f96d03541e960d463836200d2b01269b5e008
Todd Kennedy [Thu, 18 May 2017 19:36:11 +0000 (19:36 +0000)]
Merge "don't dex when installing an instant app" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 19:34:58 +0000 (19:34 +0000)]
Merge "Filter package related info" into oc-dev
Yipeng Cao [Thu, 18 May 2017 19:34:29 +0000 (19:34 +0000)]
Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev
am:
b42205ee9e
Change-Id: I479deb4dc114f2f169994501230a882377f1453e
Roozbeh Pournader [Thu, 18 May 2017 19:32:02 +0000 (19:32 +0000)]
Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev
am:
99e620ef32
Change-Id: I5431864f75241c9f8b33064981ea332e7bef823b
Jean-Michel Trivi [Thu, 18 May 2017 19:31:49 +0000 (19:31 +0000)]
Merge "Audio focus: start players in ducked state when focus is already lost" into oc-dev am:
f8592a0d8b
am:
1c8334078d
Change-Id: I0fb19d951752a7010c0b00f93d4510e44ad740be
TreeHugger Robot [Thu, 18 May 2017 19:25:53 +0000 (19:25 +0000)]
Merge "Change currentTimeMillis to elapsedRealtime" into oc-dev
Jean-Michel Trivi [Thu, 18 May 2017 19:22:07 +0000 (19:22 +0000)]
Merge "Audio focus: start players in ducked state when focus is already lost" into oc-dev
am:
f8592a0d8b
Change-Id: Ia3a9606035b834d7e90d651cf8c473c0e0394b06
TreeHugger Robot [Thu, 18 May 2017 19:21:46 +0000 (19:21 +0000)]
Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev
Jean-Michel Trivi [Thu, 18 May 2017 19:06:38 +0000 (19:06 +0000)]
Merge "Audio focus: start players in ducked state when focus is already lost" into oc-dev
Bill Yi [Thu, 18 May 2017 18:28:39 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50bc1abebf8ed3ffa604de1b2e0c707522e9be9a
Auto-generated-cl: translation import
Sudheer Shanka [Thu, 18 May 2017 18:06:56 +0000 (18:06 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev am:
aff7c3c71e
am:
1768a0054d
Change-Id: Ic22cc9e7289479e8e7df8db961b240db93721a15
Dianne Hackborn [Thu, 18 May 2017 18:04:17 +0000 (18:04 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
e4f484915f
am:
4d208f2ec6
Change-Id: Idc57b2a5953b0525d7c51999bcefdba868c68e16
Todd Kennedy [Thu, 18 May 2017 17:58:29 +0000 (17:58 +0000)]
Merge "Add action to launch intent" into oc-dev am:
ed57e46089
am:
61bfa28b97
Change-Id: I5ca06a8da6aa5ded02670736dacdb1e4c39a6169
Adam Lesinski [Thu, 18 May 2017 17:56:15 +0000 (17:56 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev am:
2d885e942d
am:
0196460f27
Change-Id: I8bff9b440b5a1f75d75e3601b654aa8825cf9523
Sudheer Shanka [Thu, 18 May 2017 17:53:28 +0000 (17:53 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev
am:
aff7c3c71e
Change-Id: Ie7691a19ef61668afd9200c9a3c77fa9fc5368f1
Dianne Hackborn [Thu, 18 May 2017 17:50:56 +0000 (17:50 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
am:
e4f484915f
Change-Id: I644cf3173134c0aeb2cddcb8add85803aa76b362
Todd Kennedy [Thu, 18 May 2017 17:48:09 +0000 (17:48 +0000)]
Merge "Add action to launch intent" into oc-dev
am:
ed57e46089
Change-Id: Ib34609428416c6356fa1c5af08411dfc389372a0
Adam Lesinski [Thu, 18 May 2017 17:42:44 +0000 (17:42 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
am:
2d885e942d
Change-Id: Ic1c24dd55a4d6258533e57cea957a775e03013df
Sudheer Shanka [Thu, 18 May 2017 17:42:10 +0000 (17:42 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev
Winson Chung [Thu, 18 May 2017 17:37:51 +0000 (17:37 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev am:
13bd634262
am:
8d7692c8cf
Change-Id: I7dc950c411efbd8e6c7fd6f2d3031ebd80d8ac72
Dianne Hackborn [Thu, 18 May 2017 17:35:08 +0000 (17:35 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
TreeHugger Robot [Thu, 18 May 2017 17:31:04 +0000 (17:31 +0000)]
Merge "Add action to launch intent" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 17:30:21 +0000 (17:30 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
Winson Chung [Thu, 18 May 2017 17:27:59 +0000 (17:27 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev
am:
13bd634262
Change-Id: I37ba0818f8bac5b88f2887825a0595f0550316bf
Winson Chung [Thu, 18 May 2017 17:18:52 +0000 (17:18 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev
Yipeng Cao [Tue, 16 May 2017 03:23:12 +0000 (20:23 -0700)]
Change currentTimeMillis to elapsedRealtime
System.currentTimeMillis does not gauntness to be monotonically
increasing, changed to SystemClock.elapsedRealtime
Bug:
38317243
Fixes:
38317243
Test: make -j 32; flash the angler device using local build
Change-Id: I3fd8f8b03655183d257d69412bc1c17cc38ccead
Merged-In: I75a70d43028e901d9f3459d6b525cac58e8e64af
Winson Chung [Mon, 15 May 2017 21:20:46 +0000 (14:20 -0700)]
Fixing issue with double tapping PiP.
- If a user taps the PiP quickly multiple times, you can hit a case where
you expand the PIP, which triggers the re-registration of the
InputConsumer, but doesn't disable touches until the pinned stack
animation starts. If the user taps in between that time, it can trigger
a resizing of the stack what aborts the expand animation
- Also adding additional debugging logs
Bug:
37657050
Test: Quickly tap the PiP
Change-Id: Ib0088a3aa8e917aca3214c289a0787bdf7e66199
Antony Sargent [Thu, 18 May 2017 16:54:17 +0000 (16:54 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev am:
8d87842690
am:
81877dbb79
Change-Id: Ia5bf4beb7325e63d718073edfcea5360965ac8c3
Jean-Michel Trivi [Wed, 17 May 2017 00:59:54 +0000 (17:59 -0700)]
Audio focus: start players in ducked state when focus is already lost
The volume ramp for ducking is only to be heard when a player is
playing while focus is lost. When a player is starting when
focus is already lost (and ducking is applicable), it should
play at the same level as that reached after a duck. This is
implemented using the VolumeShaper.Operation time offset
(a.k.a. XOffset), set to 1, i.e. the end of the duck.
Test: see bug
Bug:
38353147
Change-Id: Iec36fbe002b183d6d70c258d9ab26b577dc1d2ce
Antony Sargent [Thu, 18 May 2017 16:46:08 +0000 (16:46 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev
am:
8d87842690
Change-Id: Idbb41ac149976073add1f03e9aa3d888d36c999d
Antony Sargent [Thu, 18 May 2017 16:37:28 +0000 (16:37 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev
Andy Hung [Thu, 18 May 2017 16:34:39 +0000 (16:34 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev am:
b33c0eb07a
am:
0cc01b5bc2
Change-Id: I9afcd844391b56991b5cc686808f89b4ec878a31
Andy Hung [Thu, 18 May 2017 16:26:41 +0000 (16:26 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
am:
b33c0eb07a
Change-Id: Icc37873492d612a66484d731168de5c5e27213c9
Jeff Sharkey [Thu, 18 May 2017 16:23:23 +0000 (16:23 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev am:
91f674eeda
am:
e261ea2195
Change-Id: I184f06046d89a182f505508351bf64f29072467a
Andy Hung [Thu, 18 May 2017 16:15:44 +0000 (16:15 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
Jeff Sharkey [Thu, 18 May 2017 16:13:42 +0000 (16:13 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev
am:
91f674eeda
Change-Id: If6537f3a9f00e5379b2de5db1d8b9712bc20798d
Jeff Sharkey [Thu, 18 May 2017 16:11:07 +0000 (16:11 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev am:
997042ac33
am:
c244963675
Change-Id: I30e0155a9260ec4099ad45d7161c8459c8b657a2
Christine Franks [Thu, 18 May 2017 16:04:30 +0000 (16:04 +0000)]
Merge "Don't back up night display state settings"
Jeff Sharkey [Thu, 18 May 2017 16:02:49 +0000 (16:02 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev
am:
997042ac33
Change-Id: I6da01817370fa1244499644497396a57e55df492
Jeff Sharkey [Thu, 18 May 2017 15:59:34 +0000 (15:59 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev
TreeHugger Robot [Thu, 18 May 2017 15:52:37 +0000 (15:52 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev
Jorim Jaggi [Thu, 18 May 2017 15:07:36 +0000 (15:07 +0000)]
Merge "Enable starting window logging" into oc-dev am:
5616c5f610
am:
682cd21187
Change-Id: I36e3fbd30d52446a7c3f281da28041ba0fa6e7d1
Jorim Jaggi [Thu, 18 May 2017 14:59:53 +0000 (14:59 +0000)]
Merge "Enable starting window logging" into oc-dev
am:
5616c5f610
Change-Id: I474a4db75828a2c8063c2761f046df3af07c92b9
Jorim Jaggi [Thu, 18 May 2017 14:51:44 +0000 (14:51 +0000)]
Merge "Enable starting window logging" into oc-dev
Todd Kennedy [Wed, 17 May 2017 22:16:04 +0000 (15:16 -0700)]
don't dex when installing an instant app
Bug:
38259387
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: install an instant app, see that it doesn't dex
Test: install a full app, see that it does dex
Change-Id: Id7dc749954d0be24bbd80da2ef0f43e39f77993e
Jorim Jaggi [Thu, 18 May 2017 12:58:33 +0000 (12:58 +0000)]
Merge "Fix refactoring typo" into oc-dev am:
4566518ff2
am:
13f214916c
Change-Id: I2101b07da283ed93e4286947d5d3115646c509eb
Jorim Jaggi [Thu, 18 May 2017 12:52:52 +0000 (12:52 +0000)]
Merge "Fix refactoring typo" into oc-dev
am:
4566518ff2
Change-Id: Iee60a8e32c907832cdb54a545f6a07518804f6bd
Jorim Jaggi [Wed, 17 May 2017 13:10:29 +0000 (15:10 +0200)]
Enable starting window logging
Also extend it to make sure we catch the bug!
Test: Open a couple of cold/hot apps, make sure logs look accurate
Bug:
37888853
Change-Id: Ied394969748d4d2d40359af15e0b491a2dc2b078
Jorim Jaggi [Thu, 18 May 2017 12:41:18 +0000 (12:41 +0000)]
Merge "Fix refactoring typo" into oc-dev
Przemyslaw Szczepaniak [Thu, 18 May 2017 12:22:33 +0000 (12:22 +0000)]
resolve merge conflicts of
2ce1b38e85af to oc-dev-plus-aosp
am:
3a9f256329 -s ours
Change-Id: If5f8e616ae84df0b850aa29d2db06961e91acc1a
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:57:09 +0000 (10:57 +0100)]
resolve merge conflicts of
2ce1b38e85af to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia1eb0590edf2b074f6cbf16060cda2257091edd8
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:15:30 +0000 (09:15 +0000)]
Merge "Consolidated all data allow/disallow logic into one method" am:
449d73251f
am:
ab0f6fc5d2
Change-Id: I31606372f361ad0cb8d9600f79c41257e121c7f4
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:07:24 +0000 (09:07 +0000)]
Merge "Consolidated all data allow/disallow logic into one method"
am:
449d73251f
Change-Id: I861d75dad60ab83039aa06565141a2eb5b294386
Przemyslaw Szczepaniak [Thu, 18 May 2017 08:58:26 +0000 (08:58 +0000)]
Merge "Consolidated all data allow/disallow logic into one method"
TreeHugger Robot [Thu, 18 May 2017 08:43:19 +0000 (08:43 +0000)]
Merge "Add metrics constant for Choose Lock Dialog"
TreeHugger Robot [Thu, 18 May 2017 06:38:01 +0000 (06:38 +0000)]
Merge "Avoid a race condition on reading qemu.gles property"
TreeHugger Robot [Thu, 18 May 2017 06:30:26 +0000 (06:30 +0000)]
Merge "Added indication text stubs for changes to trust being managed."
OSDN Git Service
