OSDN Git Service
Android Build Merger (Role) [Mon, 31 Jul 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am:
810c312a29 am:
c2e30cd5c9" into oc-mr1-dev-plus-aosp
Michal Karpinski [Mon, 31 Jul 2017 19:14:16 +0000 (19:14 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev am:
810c312a29
am:
c2e30cd5c9
Change-Id: If613847830b9fc820838e685ba2e57dadaae0765
Android Build Merger (Role) [Mon, 31 Jul 2017 19:13:22 +0000 (19:13 +0000)]
Merge "Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am:
1fd7497f02 am:
c71e73863e" into oc-mr1-dev-plus-aosp
Bryce Lee [Mon, 31 Jul 2017 19:11:28 +0000 (19:11 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am:
1fd7497f02
am:
c71e73863e
Change-Id: Ib21c402bef3a5a73ab0a4e4133bb45faeb2b23e8
Eugene Susla [Mon, 31 Jul 2017 19:10:40 +0000 (19:10 +0000)]
Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-dev
am:
978b8e1842
Change-Id: If3a550f694858d636e19b77a20837516f75a9545
Bryce Lee [Mon, 31 Jul 2017 19:07:16 +0000 (19:07 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev am:
1fd7497f02
am:
343d82adf6
Change-Id: Id708764483b96ff77e9de23e4dd64c365bcf60c5
Michal Karpinski [Mon, 31 Jul 2017 19:03:13 +0000 (19:03 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
am:
810c312a29
Change-Id: Ida86b2e9f68683c88db24bcbb16eaf14ce8f2d94
TreeHugger Robot [Mon, 31 Jul 2017 18:59:52 +0000 (18:59 +0000)]
Merge "[Companion] Fix NPE due to looking up view btoo soon" into oc-mr1-dev
Android Build Merger (Role) [Mon, 31 Jul 2017 18:56:43 +0000 (18:56 +0000)]
Merge "Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am:
33d4702a12 am:
69aac0a7b6" into oc-mr1-dev-plus-aosp
Bryce Lee [Mon, 31 Jul 2017 18:55:39 +0000 (18:55 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
am:
1fd7497f02
Change-Id: Ibc323f15a9a0bc6302ff105036964374c044b5e7
Bryce Lee [Mon, 31 Jul 2017 18:54:47 +0000 (18:54 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am:
33d4702a12
am:
69aac0a7b6
Change-Id: Iac240206ebe869cc4e9819a0222f858c11516830
Bryce Lee [Mon, 31 Jul 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev am:
33d4702a12
am:
05865fb40a
Change-Id: Ia5817040ce14ee6dbd995bd83444f34e78bef375
TreeHugger Robot [Mon, 31 Jul 2017 18:51:17 +0000 (18:51 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
Bryce Lee [Mon, 31 Jul 2017 18:50:32 +0000 (18:50 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
am:
1fd7497f02
Change-Id: Ibc6ea27ae4e813e3430ea75c8c26057f6bec2304
Bryce Lee [Mon, 31 Jul 2017 18:46:20 +0000 (18:46 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am:
33d4702a12
Change-Id: I990a3554730cc07440c7d4bc0236e0aeb00e2980
Bryce Lee [Mon, 31 Jul 2017 18:45:19 +0000 (18:45 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am:
33d4702a12
Change-Id: Id6748aab9ee83844303324ea397d4ac699fb5839
Seigo Nonaka [Mon, 31 Jul 2017 18:36:49 +0000 (18:36 +0000)]
Merge "Stop font loading with restricted context." into oc-mr1-dev
am:
06ba486a74
Change-Id: I0c668e01f9fe254b6bedace52d19bd7bcb5d5f1f
Bryce Lee [Mon, 31 Jul 2017 18:34:23 +0000 (18:34 +0000)]
Merge "Allow foreground AppWindowToken to influence orientation." into oc-dr1-dev
Bryce Lee [Mon, 31 Jul 2017 18:32:30 +0000 (18:32 +0000)]
Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 18:23:04 +0000 (18:23 +0000)]
Merge "Stop font loading with restricted context." into oc-mr1-dev
Makoto Onuki [Mon, 31 Jul 2017 18:03:17 +0000 (18:03 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
am:
bb77e6c689
Change-Id: Ia47cf7d0832ef6ca99b4f4991c2e2624bdf03742
TreeHugger Robot [Mon, 31 Jul 2017 17:52:41 +0000 (17:52 +0000)]
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
Steven Moreland [Mon, 31 Jul 2017 17:00:59 +0000 (17:00 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers am:
f53501098c am:
a3ca9caf46
am:
a862715976
Change-Id: I398296dcc973240a2f2da488b4058cee51240140
Android Build Merger (Role) [Mon, 31 Jul 2017 16:57:19 +0000 (16:57 +0000)]
Merge "Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am:
cbab3edc3e am:
0cd8a31c12" into oc-mr1-dev-plus-aosp
Steven Moreland [Mon, 31 Jul 2017 16:55:02 +0000 (16:55 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers am:
f53501098c
am:
a3ca9caf46
Change-Id: I0049a5ffd8f24cd7d77506c5515216a4bf15b218
Adrian Roos [Mon, 31 Jul 2017 16:55:01 +0000 (16:55 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am:
cbab3edc3e
am:
3bc413bca8
Change-Id: I07022fc1006f3e9470791cf4f51000315139f899
Adrian Roos [Mon, 31 Jul 2017 16:54:59 +0000 (16:54 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am:
cbab3edc3e
am:
0cd8a31c12
Change-Id: Ifd3f36bb8ea399b77b06903cd9be589eee3d922a
Adrian Roos [Mon, 31 Jul 2017 16:48:44 +0000 (16:48 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
am:
cbab3edc3e
Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed
Adrian Roos [Mon, 31 Jul 2017 16:48:34 +0000 (16:48 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
am:
cbab3edc3e
Change-Id: Ibd62f5942fd09e0c1ec846db0595c76d0ad822be
Steven Moreland [Mon, 31 Jul 2017 16:48:25 +0000 (16:48 +0000)]
SurfaceTexture.cpp: use proper nativehelper headers
am:
f53501098c
Change-Id: I2f4eb3fdbfe875d820e52136d8fb72b60e56b046
TreeHugger Robot [Mon, 31 Jul 2017 16:43:07 +0000 (16:43 +0000)]
Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev
Steven Moreland [Fri, 28 Jul 2017 17:21:47 +0000 (10:21 -0700)]
SurfaceTexture.cpp: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: SurfaceTexture.cpp finds headers
Bug:
63762847
Change-Id: I3ec1b888c226c2894649d9f9a8f8203891c1ab02
(cherry picked from commit
849252c469396a759c394dc6382470a6a07d6587)
Bryce Lee [Fri, 28 Jul 2017 15:33:36 +0000 (08:33 -0700)]
Do not call onConfigurationChanged for appBound position changes.
Since appBounds encodes both dimensions and positions, movement will
cause a diff change. This happens in situations where the dimensions
stay constant, such as dragging a PiP window around.
To avoid flooding the client side with configuration changes, this CL
checks whether the new configuration is equivalent to the existing
configuration with the exception of the position of the appBounds
before sending to the registered callbacks.
Change-Id: I8fbc94458fd9ed3b39494c3587f25e704ec02a7d
Fixes:
63927944
Test: bit FrameworksServicesTests:com.android.server.wm.AppBoundsTests
Test: go/wm-smoke
Bryce Lee [Sat, 29 Jul 2017 03:48:43 +0000 (20:48 -0700)]
Allow foreground AppWindowToken to influence orientation.
It is possible for an activity to request an orientation after
finish has been called, causing the system orientation to be
re-evaluated. Since the activity is closing, it will no longer be
eligible to influence orientation. If another stack/task is brought
to the foreground, it will as well won't be able to participate
since it is not considered an opening app and won't be visible. As a
result, we set the orientation to unspecified, leading to the
foreground activity to be resumed in the wrong orientation.
This changelist addresses the issue by allowing an AppWindowToken to
participate in orientation calculations if it is not closing and is
on top of the wm hierarchy, regardless of its visibility.
Change-Id: I0f316d6d824398d084c7648cf2dc2c2d07b4410d
Fixes:
63982461
Fixes:
63513655
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests#testGetOrientation
Test: go/wm-smoke
Selim Gurun [Mon, 31 Jul 2017 14:35:22 +0000 (14:35 +0000)]
Merge "Update documentation for Whitelist API" into oc-mr1-dev
am:
a30ec5ff4c
Change-Id: I28b1d260e9daf408a71494e054dba59954ef926b
Selim Gurun [Mon, 31 Jul 2017 14:27:52 +0000 (14:27 +0000)]
Merge "Update documentation for Whitelist API" into oc-mr1-dev
Adrian Roos [Mon, 31 Jul 2017 13:56:24 +0000 (15:56 +0200)]
WakeAndUnlock: Make sure blanking is never animated
Fixes an issue where instead of immediately blanking the screen upon
authenticating via fingerprint we animated to blank because another
animating transition was requested at the same time.
Change-Id: I141079c0d4de1776c8328057d364eeb0964eebaf
Fixes:
64080116
Test: Unlock via fingerprint a lot. Verify no flicker.
Neil Fuller [Mon, 31 Jul 2017 13:29:53 +0000 (13:29 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e am:
b65356709e am:
452dcfce41
am:
9fadf818c6
Change-Id: I258b27a87297cae46218991df26f10f91ac5ae12
Neil Fuller [Mon, 31 Jul 2017 13:21:41 +0000 (13:21 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e am:
b65356709e
am:
452dcfce41
Change-Id: I699962dee85ff318433004cd91f183c0630e3888
Neil Fuller [Mon, 31 Jul 2017 13:06:44 +0000 (13:06 +0000)]
Merge "Remove redundant TODOs from PackageTracker" am:
01d686b85e
am:
b65356709e
Change-Id: Icbc33207a154b566791210d6c6169235c139562a
Neil Fuller [Mon, 31 Jul 2017 13:00:50 +0000 (13:00 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
am:
01d686b85e
Change-Id: If74fa1bcd6be188079de231e7903795ea7d0b5be
Neil Fuller [Mon, 31 Jul 2017 12:51:05 +0000 (12:51 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
Android Build Merger (Role) [Mon, 31 Jul 2017 12:44:38 +0000 (12:44 +0000)]
Merge "Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am:
3cace2a148 am:
86e49f224c" into oc-mr1-dev-plus-aosp
Adrian Roos [Mon, 31 Jul 2017 12:42:17 +0000 (12:42 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am:
3cace2a148
am:
86e49f224c
Change-Id: Id2ce270c16978b6856598cbc5a2342ca1def27f0
Adrian Roos [Mon, 31 Jul 2017 12:42:13 +0000 (12:42 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am:
3cace2a148
am:
13b17b2990
Change-Id: Ib7e303b11b47096daf7216cd6dbd109a047733f9
Adrian Roos [Mon, 31 Jul 2017 12:36:21 +0000 (12:36 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
am:
3cace2a148
Change-Id: Ia30c3884751a44392efb843a2da41a0528162fa2
Adrian Roos [Mon, 31 Jul 2017 12:36:20 +0000 (12:36 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
am:
3cace2a148
Change-Id: I94e9f30fa3f56b56c140f834674d38b776c8ed21
Adrian Roos [Mon, 31 Jul 2017 12:29:44 +0000 (12:29 +0000)]
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
Yohei Yukawa [Mon, 31 Jul 2017 07:15:26 +0000 (07:15 +0000)]
Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev
am:
f678eaad89
Change-Id: I690e4fe17fcbceab3488c40dce2baec9cc97a3e7
TreeHugger Robot [Mon, 31 Jul 2017 07:08:08 +0000 (07:08 +0000)]
Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev
Bill Yi [Mon, 31 Jul 2017 06:15:13 +0000 (06:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
273bb516ad -s ours
am:
b10ffae3cb -s ours
Change-Id: I32c733afa59e9ffc0116539a25600971f7fcecb9
Bill Yi [Mon, 31 Jul 2017 06:12:15 +0000 (06:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
273bb516ad -s ours
am:
9640d57039 -s ours
Change-Id: I41cdb883ff865fd88b607eb9f4ea5653866e1830
Bill Yi [Mon, 31 Jul 2017 06:06:17 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
273bb516ad -s ours
Change-Id: I5b0b3e17d14a5d86a2b7296f385e947f30cd3332
Bill Yi [Mon, 31 Jul 2017 06:06:14 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
98a98d4cb9 -s ours
Change-Id: I1511d72e48f1f360663933da8847694de558d3fe
Bill Yi [Mon, 31 Jul 2017 06:06:13 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
273bb516ad -s ours
Change-Id: Id0870731ec3a6b1e10a413bcd0f1e74178a55271
TreeHugger Robot [Mon, 31 Jul 2017 06:00:50 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 31 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Yohei Yukawa [Mon, 31 Jul 2017 03:54:08 +0000 (20:54 -0700)]
Remove a compat hack SurfaceView#setWindowType()
This CL logically reverts a compatibility hack I introduced [1] for
apps that had relied on @hide method SurfaceView#setWindowType(int).
[1]: I5217f6417a73690ae8a978754218b7b089070fdd
3b5011afc9e17963607269bfb6665d04e3ab4ca1
Fixes:
62054282
Test: Manually verified that Bug
36345857 is still not reproducible
Change-Id: Icee198c554de558cfa4ffe0b264064969839654e
Hugo Benichi [Mon, 31 Jul 2017 02:13:17 +0000 (02:13 +0000)]
Merge "Logging improvements when NetworkCapabilities change" am:
f60a38e152 am:
bdfb4ee19c am:
88a572da7d -s ours
am:
5946442f8e -s ours
Change-Id: Ia69626f61d00be9a6da3655111999f70423325c9
Hugo Benichi [Mon, 31 Jul 2017 02:07:12 +0000 (02:07 +0000)]
Merge "Logging improvements when NetworkCapabilities change" am:
f60a38e152 am:
bdfb4ee19c
am:
88a572da7d -s ours
Change-Id: I5f6e3a2109236f30d0e09bde8a2c63b32e62f772
Hugo Benichi [Mon, 31 Jul 2017 01:58:33 +0000 (01:58 +0000)]
Merge "Logging improvements when NetworkCapabilities change" am:
f60a38e152
am:
bdfb4ee19c
Change-Id: Ie7f90ac6b8073e756ff14afcaac7ed291b165e87
Hugo Benichi [Mon, 31 Jul 2017 01:50:38 +0000 (01:50 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
am:
f60a38e152
Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c
pkanwar [Mon, 31 Jul 2017 01:44:09 +0000 (01:44 +0000)]
Add string needed to support carrier wifi in UI.
am:
bf7ceec031
Change-Id: I669fcd9904e23943ecd2dd0a9f558209fd00b1c5
Treehugger Robot [Mon, 31 Jul 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
Hugo Benichi [Tue, 25 Jul 2017 02:40:56 +0000 (11:40 +0900)]
Logging improvements when NetworkCapabilities change
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.
Bug:
63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c
(cherry pick from commit
683ea489d302b494ab40c0d5dc97d352a59d8aa9)
Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
pkanwar [Fri, 28 Jul 2017 18:10:55 +0000 (11:10 -0700)]
Add string needed to support carrier wifi in UI.
Add strings which will be used to indicate to the user in the wifi
picker and wifi config that they are connecting/connected to carrier
wifi.
Bug:
30988281
Test: manual
Change-Id: I41e63ce831dface4f2baf2879dde84ebe2fecc94
Rajeev Kumar [Sun, 30 Jul 2017 00:22:53 +0000 (00:22 +0000)]
Merge "Add more variations of subscription plan to the fake subscription plan list." into oc-mr1-dev
am:
a20bf80aa3
Change-Id: I794aa19a079c687de5d532a710e250984ba2928a
TreeHugger Robot [Sun, 30 Jul 2017 00:18:21 +0000 (00:18 +0000)]
Merge "Add more variations of subscription plan to the fake subscription plan list." into oc-mr1-dev
Jeff Sharkey [Sun, 30 Jul 2017 00:15:17 +0000 (00:15 +0000)]
Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev
am:
2c131cafae
Change-Id: I1f1d834712004b520a02d3116de945c668236f81
Rajeev Kumar [Sun, 30 Jul 2017 00:12:35 +0000 (00:12 +0000)]
Merge "Fix NPE in calling getSubscriptionPlans method." into oc-mr1-dev
am:
d4c36badff
Change-Id: I29fab7adc623a8d18e8e8ac5524d78376690e290
TreeHugger Robot [Sun, 30 Jul 2017 00:09:04 +0000 (00:09 +0000)]
Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev
TreeHugger Robot [Sun, 30 Jul 2017 00:05:07 +0000 (00:05 +0000)]
Merge "Fix NPE in calling getSubscriptionPlans method." into oc-mr1-dev
Android Build Merger (Role) [Sat, 29 Jul 2017 23:27:44 +0000 (23:27 +0000)]
Merge "Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am:
f98facc3b8 am:
835f5e41de" into oc-mr1-dev-plus-aosp
Lucas Dupin [Sat, 29 Jul 2017 23:24:29 +0000 (23:24 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am:
f98facc3b8
am:
58d7a76e8d
Change-Id: Ie155db391504fc788036c2a9defae375b6a0b510
Lucas Dupin [Sat, 29 Jul 2017 23:24:29 +0000 (23:24 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am:
f98facc3b8
am:
835f5e41de
Change-Id: I8d62b640ac73f8a71931722a837726906ef2e49b
Lucas Dupin [Sat, 29 Jul 2017 23:17:49 +0000 (23:17 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am:
f98facc3b8
Change-Id: I4c4eb814d8ea2152644665daf6fbd6eb28d81b06
Lucas Dupin [Sat, 29 Jul 2017 23:17:49 +0000 (23:17 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am:
f98facc3b8
Change-Id: Iab836083f7e3ea86263de1a1d2a2d69d7e25fe73
Android Build Merger (Role) [Sat, 29 Jul 2017 23:14:52 +0000 (23:14 +0000)]
Merge "Merge "Fix issue where clock inflation would fail" into oc-dr1-dev am:
011ac1bb7c am:
e244efd69f" into oc-mr1-dev-plus-aosp
Lucas Dupin [Sat, 29 Jul 2017 23:12:03 +0000 (23:12 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev am:
011ac1bb7c
am:
e244efd69f
Change-Id: Id494550276503ba819e6a7fad45c385247c473f7
Lucas Dupin [Sat, 29 Jul 2017 23:11:59 +0000 (23:11 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev am:
011ac1bb7c
am:
0e353d3c12
Change-Id: If17846bcd43ace216d74e06b3be78d6a5e4453af
TreeHugger Robot [Sat, 29 Jul 2017 23:08:04 +0000 (23:08 +0000)]
Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
Lucas Dupin [Sat, 29 Jul 2017 23:04:09 +0000 (23:04 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev
am:
011ac1bb7c
Change-Id: I2c1685e78a2de37192eceff40d254546b37d7d5e
Lucas Dupin [Sat, 29 Jul 2017 23:04:06 +0000 (23:04 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev
am:
011ac1bb7c
Change-Id: If6aa57364f74e94f9460ef4190a9996fbdae600f
TreeHugger Robot [Sat, 29 Jul 2017 22:56:28 +0000 (22:56 +0000)]
Merge "Fix issue where clock inflation would fail" into oc-dr1-dev
Android Build Merger (Role) [Sat, 29 Jul 2017 22:27:00 +0000 (22:27 +0000)]
Merge "Merge "Fix BLE scan leaks" into oc-dr1-dev am:
604a4b7171 am:
b7e2c50214" into oc-mr1-dev-plus-aosp
Vinay Kalia [Sat, 29 Jul 2017 22:24:30 +0000 (22:24 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev am:
604a4b7171
am:
b7e2c50214
Change-Id: I967febb18b966e8d2581569608b9fd228b1b7e82
Vinay Kalia [Sat, 29 Jul 2017 22:24:24 +0000 (22:24 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev am:
604a4b7171
am:
7d06d7bd79
Change-Id: I54ff5a6a0ccc29a2e4acb9983c0610f18c9f7950
Vinay Kalia [Sat, 29 Jul 2017 22:17:06 +0000 (22:17 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev
am:
604a4b7171
Change-Id: I65e4990a08cc59ce30ee6d987f13a0381b42e58f
Vinay Kalia [Sat, 29 Jul 2017 22:17:03 +0000 (22:17 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev
am:
604a4b7171
Change-Id: I9e3f7a0d3b871e5c5e2a740ec69eacaa2cbc41e2
TreeHugger Robot [Sat, 29 Jul 2017 22:08:36 +0000 (22:08 +0000)]
Merge "Fix BLE scan leaks" into oc-dr1-dev
Steven Moreland [Sat, 29 Jul 2017 20:14:27 +0000 (20:14 +0000)]
Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp am:
124acec8ad
am:
d0ea5528fe
Change-Id: Ibaf3d0551fd08bd9d3a7f91a6fa2cfcf3488175f
Steven Moreland [Sat, 29 Jul 2017 20:06:25 +0000 (20:06 +0000)]
Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
am:
124acec8ad
Change-Id: I1b9f55ed3661a440b89a7820bf4d1b9c66f240af
TreeHugger Robot [Sat, 29 Jul 2017 19:58:54 +0000 (19:58 +0000)]
Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
Jeff Sharkey [Sat, 29 Jul 2017 16:24:06 +0000 (16:24 +0000)]
Merge "Merge "Add a missing null check" into oc-dev am:
101fca656d am:
d56b01e022" into oc-dr1-dev-plus-aosp
am:
a2ca184e30
Change-Id: I1e6ba0f17b816abebb0184038de15754a660c68a
Android Build Merger (Role) [Sat, 29 Jul 2017 16:20:14 +0000 (16:20 +0000)]
Merge "Merge "Add a missing null check" into oc-dev am:
101fca656d am:
ea99954804 am:
a8f3b3d774" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Sat, 29 Jul 2017 16:17:33 +0000 (16:17 +0000)]
Merge "Add a missing null check" into oc-dev am:
101fca656d am:
ea99954804
am:
a8f3b3d774
Change-Id: I30a0ba602d88d9457a07997cab1d1ea1882de572
Jeff Sharkey [Sat, 29 Jul 2017 16:17:08 +0000 (16:17 +0000)]
Merge "Add a missing null check" into oc-dev am:
101fca656d am:
ea99954804
am:
567fe364d4
Change-Id: I9f2b25bf6f45a711b1cf18ca473a1f545ceb7cef
Android Build Merger (Role) [Sat, 29 Jul 2017 16:16:01 +0000 (16:16 +0000)]
Merge "Merge "Add a missing null check" into oc-dev am:
101fca656d am:
d56b01e022" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Sat, 29 Jul 2017 16:14:03 +0000 (16:14 +0000)]
Merge "Add a missing null check" into oc-dev am:
101fca656d
am:
d56b01e022
Change-Id: I48191b693fac40513b670c711afea568eafe1ebf
Jeff Sharkey [Sat, 29 Jul 2017 16:11:35 +0000 (16:11 +0000)]
Merge "Add a missing null check" into oc-dev am:
101fca656d
am:
ea99954804
Change-Id: If4d45586afd4dde05a3aad10d25f73afdcc3e92d
OSDN Git Service
