OSDN Git Service
Jeff Sharkey [Mon, 12 Jun 2017 22:45:22 +0000 (22:45 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev
am:
05b52d8ba5
Change-Id: I36dbac981e7a11819bd120c604f491eca11018a4
Jeff Sharkey [Mon, 12 Jun 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev
Todd Kennedy [Mon, 12 Jun 2017 21:57:15 +0000 (21:57 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
am:
3ef0b8260f
Change-Id: Ibcc839c12fd0c23da254992a7147abb1e08d17cc
TreeHugger Robot [Mon, 12 Jun 2017 21:51:27 +0000 (21:51 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
Vladislav Kaznacheev [Mon, 12 Jun 2017 21:51:10 +0000 (21:51 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
am:
3fbcec5b86
Change-Id: I9ff9e36b3fa7c0e3c0bd4cd2048f9d0ce510399c
TreeHugger Robot [Mon, 12 Jun 2017 21:42:50 +0000 (21:42 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
* changes:
Pass window token when creating a tooltip popup
Revert "Use a PopupWindow to show tooltips"
Bill Yi [Mon, 12 Jun 2017 21:21:12 +0000 (21:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c2a12b658 -s ours
Change-Id: I4170e095966f1d8752e2b020777b5719a779b376
TreeHugger Robot [Mon, 12 Jun 2017 21:15:29 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Will Brazil [Mon, 12 Jun 2017 20:49:49 +0000 (20:49 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
am:
71029bf631
Change-Id: I24120e653feef23b155111cbc69f6b3033b2427c
TreeHugger Robot [Mon, 12 Jun 2017 20:45:37 +0000 (20:45 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
Jeff Sharkey [Mon, 12 Jun 2017 20:17:10 +0000 (14:17 -0600)]
Improve developer docs for storage APIs.
No code changes; only docs.
Test: builds
Bug:
38508833,
37987197,
37978296
Change-Id: Idfeb680480b2f818d18f787cbf20ceab896763a2
Amit Pawar [Mon, 12 Jun 2017 20:09:07 +0000 (20:09 +0000)]
Merge "Fix wake-and-unlock animation" into oc-dev
am:
8f1d13300f
Change-Id: Ib0876be70423fa3218ffb3172f3a177c45f98681
Amit Pawar [Mon, 12 Jun 2017 20:00:51 +0000 (20:00 +0000)]
Merge "Fix wake-and-unlock animation" into oc-dev
Vladislav Kaznacheev [Mon, 12 Jun 2017 19:10:49 +0000 (12:10 -0700)]
Pass window token when creating a tooltip popup
This allows using tooltips in System UI.
Bug:
62065980
Test: android.view.cts.TooltipTest passes
Change-Id: If0a76d0806aa92efa4be57204c4517242b0ebb99
Felipe Leme [Mon, 12 Jun 2017 19:05:34 +0000 (19:05 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev
am:
7c41ddb975
Change-Id: I5453d54e45385a03bae56a4742bcd680aff47356
Will Brazil [Fri, 9 Jun 2017 19:22:53 +0000 (12:22 -0700)]
Camera2: Cache method list in MethodNameInvoker.
Retrieving list of methods in every invoke() call is very expensive.
Caching the list inside the constructor prevents several unnecessary
calls to Class.getMethods().
Test: Run camera2 CTS
Bug:
62490715
Change-Id: Ib2a93af0f364b055df2eab9bd7870730428429ad
Vladislav Kaznacheev [Mon, 12 Jun 2017 18:59:29 +0000 (18:59 +0000)]
Revert "Use a PopupWindow to show tooltips"
This reverts commit
77e539775b52da55a8b23f1a9765d471ee782013.
Change-Id: Ic4054e0d507ce95ab93282d4da002dd804aeb26d
TreeHugger Robot [Mon, 12 Jun 2017 18:58:01 +0000 (18:58 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev
Jorim Jaggi [Sat, 10 Jun 2017 01:00:00 +0000 (18:00 -0700)]
Fix wake-and-unlock animation
Since okToDisplay was false when we started the keyguard exit
animation, no animation was applied and we didn't create a
starting window, which lead to flickering. We fix this by
allowing animations from mScreenOnEarly.
Furthermore, we synchronize the navigation bar better with the
rest of the animation.
We also need to apply no animation to the status bar window as
we go through performShowLocked because we were waiting for it
to draw.
Test: go/wm-smoke
Test: Wake-and-unlock
Test: Make sure no other regression with screen on experience
Change-Id: I5f264b74cc258e8d7f608978edfb1faa5ead385c
Fixes:
38441599
Bill Yi [Mon, 12 Jun 2017 18:17:27 +0000 (11:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3fc0aef0174fec3bbe3e215a75dd4169d319b81c
Auto-generated-cl: translation import
Todd Kennedy [Mon, 12 Jun 2017 17:33:32 +0000 (10:33 -0700)]
Don't log all instant app resolutions
we only want to log the successes
Change-Id: I31c79a1c964088ee67fd7527ca7fea16b0d29830
Fixes:
36563095
Test: Manual; run and see that only the success events are in the eventlog
Dianne Hackborn [Mon, 12 Jun 2017 16:49:08 +0000 (16:49 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
4eb76b2db8
Change-Id: I34f85b8e06b3eddfee1ea57e8dfcd3ef74e10ff3
Dianne Hackborn [Mon, 12 Jun 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
Chris Thornton [Mon, 12 Jun 2017 16:25:59 +0000 (16:25 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am:
484fb951e0
Change-Id: Ice2c1b83135368f11884f4d8b2cfab138715e69a
Chris Thornton [Mon, 12 Jun 2017 15:54:24 +0000 (15:54 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
Lorenzo Colitti [Mon, 12 Jun 2017 12:29:30 +0000 (12:29 +0000)]
Change the multipath hint default to 0.
am:
d1e7d3d73e
Change-Id: I7fdd9eb04e3b92bd28218fc3a33a6157f84cdc2f
Lorenzo Colitti [Mon, 12 Jun 2017 10:01:34 +0000 (19:01 +0900)]
Change the multipath hint default to 0.
It was set to 3 (handover+reliability) during the development
cycle, but should not be set to a nonzero value on user devices
until the returned value takes into account the amount of
non-default network data usage.
Bug:
34630278
Test: marlin builds and boots
Test: ConnectivityServiceTest passes
Change-Id: I2b09a6e09c497886862cbaaaf3b283dedfbfa94c
Chris Thornton [Sun, 11 Jun 2017 00:31:57 +0000 (17:31 -0700)]
Prevent ConcurrentModificationException in updateAllRecognitions
When invoking updateAllRecognitions, if a callback binder was determined
to have died, an internal function would go and remove it from
mModelDataMap. However, updateAllRecognitions was iterating over this
map, so it would then explode. By first making a copy of the model datas
before iterating over all of them, this problem is avoided.
(As part of trying to figure out what was happening, also updated all
the method names that implicitly assumed they had a lock, and double
checked that everything with a Locked suffix is actually locked)
Bug:
62487479
Test: Use the sound trigger test app to load and start two models, force
kill the app (so the dangling binders hang around), then enable power
save (which triggers the call to updateAllRecognitions)
Change-Id: I87b9dfc1b2af5e294050b146737916ccaad882c1
Wale Ogunwale [Sat, 10 Jun 2017 16:07:56 +0000 (16:07 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
am:
b32fecd6e0
Change-Id: I599924b33fbb137ba03607308011a8a76b524c72
Wale Ogunwale [Sat, 10 Jun 2017 15:58:07 +0000 (15:58 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
Rhiannon Malia [Sat, 10 Jun 2017 07:26:46 +0000 (07:26 +0000)]
Update captive portal notif for Android TV
am:
6ab655227a
Change-Id: I2096324e76770fee698507c2681d9c2fd92165b9
Rhiannon Malia [Mon, 5 Jun 2017 22:02:55 +0000 (15:02 -0700)]
Update captive portal notif for Android TV
Test: Connect to captive portal, notification appears in side panel
BUG:
38453402
Change-Id: I39baf90897f2f3d67b8b03c31dd74fa1d39d39de
Winson Chung [Sat, 10 Jun 2017 04:57:50 +0000 (04:57 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am:
a304564081
Change-Id: I035b2e3f957334a7ef125256d5a44d2e798e61eb
Winson Chung [Sat, 10 Jun 2017 04:50:09 +0000 (04:50 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
Ben Gruver [Sat, 10 Jun 2017 00:45:02 +0000 (00:45 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am:
ffd8343ba8
Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9
Ben Gruver [Sat, 10 Jun 2017 00:38:54 +0000 (00:38 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
Robert Greenwalt [Sat, 10 Jun 2017 00:17:22 +0000 (00:17 +0000)]
Merge "Changed Locale in ServiceInfo to a list." am:
a1df5b25e6
am:
af04c43e3b
Change-Id: I5fb2897cb5456f92ea4da17d333f091f2f2c1e42
Wale Ogunwale [Fri, 9 Jun 2017 22:20:29 +0000 (15:20 -0700)]
Added 'dumpsys activity lastanr'
Allows for dumping the activity state during the last anr. This will
also be included in collected bug reports.
Bug:
38121026
Test: Cause an anr to occur and run 'adb shell dumpsys activity lastanr'
Change-Id: I1e4200f9e5cc16bfab98e5af31fc599cdd54cd11
Robert Greenwalt [Sat, 10 Jun 2017 00:10:33 +0000 (00:10 +0000)]
Merge "Changed Locale in ServiceInfo to a list."
am:
a1df5b25e6
Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e
Robert Greenwalt [Sat, 10 Jun 2017 00:03:56 +0000 (00:03 +0000)]
Merge "Changed Locale in ServiceInfo to a list."
George Mount [Fri, 9 Jun 2017 23:51:06 +0000 (23:51 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev
am:
e5e246ce5c
Change-Id: Ia06fe694f2afe55cd9560c2d6ae9112a6735cf93
Dianne Hackborn [Fri, 9 Jun 2017 23:06:01 +0000 (16:06 -0700)]
Work on issue #
62390590: SecurityException in JobIntentService$...
...JobServiceEngineImpl$WrapperWorkItem.complete
Add more useful information in the security exception message that
is shown -- the reason the last job that was running on the context
was stopped. This should tell you why when you are calling at that
point your job is no longer running.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: Ia7155248b4b4f032cbf8e8754c5437f658ed192c
George Mount [Fri, 9 Jun 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 23:30:24 +0000 (23:30 +0000)]
Merge "Fix thread booster" into oc-dev
am:
4c1209e00e
Change-Id: Iea1b674cefc1d63eaeb77511904afcf4fdc7639e
Jorim Jaggi [Fri, 9 Jun 2017 23:23:56 +0000 (23:23 +0000)]
Merge "Fix thread booster" into oc-dev
Lucas Dupin [Fri, 9 Jun 2017 23:23:20 +0000 (23:23 +0000)]
Merge "Removed test from presubmit." into oc-dev
am:
4f30aa2be8
Change-Id: I49a803f8ecadfab53a686c91c601aaead8a1c81f
Felipe Leme [Fri, 9 Jun 2017 23:18:22 +0000 (16:18 -0700)]
Removed deprecated setExtras() method.
Bug:
37563972
Test: CtsAutoFillServiceTestCases pass
Change-Id: I7fef7c81267dad9097c711dbba849adf9d6b1cc5
TreeHugger Robot [Fri, 9 Jun 2017 23:17:13 +0000 (23:17 +0000)]
Merge "Removed test from presubmit." into oc-dev
Daniel Sandler [Fri, 9 Jun 2017 23:05:19 +0000 (23:05 +0000)]
Merge "" into oc-dev
am:
0aaae4ae78
Change-Id: Ic671cd9a8718509728f6058b8d8b695cefbdc0f3
Daniel Sandler [Fri, 9 Jun 2017 22:55:42 +0000 (22:55 +0000)]
Merge "🐙" into oc-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 22:09:28 +0000 (22:09 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408" into oc-dev-plus-aosp
Felipe Leme [Fri, 9 Jun 2017 22:07:19 +0000 (22:07 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
am:
211e760408
Change-Id: Iaea8691ad9d7ce3ff1936f966a780a801e508e1f
Hall Liu [Fri, 9 Jun 2017 22:06:22 +0000 (22:06 +0000)]
Merge "Update documentation for streaming methods" am:
186a588d57
am:
01604ebfc1
Change-Id: Ia7772c9f8b231af0cf48c50c09ec72fa38007df3
Felipe Leme [Fri, 9 Jun 2017 22:02:40 +0000 (22:02 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
Hall Liu [Fri, 9 Jun 2017 21:58:50 +0000 (21:58 +0000)]
Merge "Update documentation for streaming methods"
am:
186a588d57
Change-Id: I44825b99a968b110bb23373d59aa0bb5ecaf7eac
Hall Liu [Fri, 9 Jun 2017 21:44:27 +0000 (21:44 +0000)]
Merge "Update documentation for streaming methods"
Todd Lee [Fri, 9 Jun 2017 21:40:05 +0000 (21:40 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7 am:
a58e208394
am:
1b39c88b97
Change-Id: Ib1de633f27978fd6b87606b44b45c3ac71bc2113
Winson Chung [Fri, 9 Jun 2017 21:38:39 +0000 (14:38 -0700)]
Preemptively create Bitmap from GraphicBuffer
- This call moves up the code to create a ThumbnailData from the
TaskSnapshot to ensure that it is registered with the GC even if there
is no active TaskView bound to process the event.
Bug:
62360156
Test: Run "bit CtsMediaTestCases:.DecodeAccuracyTest", and ensure that
the "Lost RAM" is relatively unchanged afterwards
Change-Id: I64af55aa40e80604864e17045798823cc6fee483
Siyamed Sinir [Fri, 9 Jun 2017 21:37:17 +0000 (21:37 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am:
bc626c6358
Change-Id: I8688bda33124a78d439f1cbcf23926a0672b0735
Svetoslav Ganov [Fri, 9 Jun 2017 21:25:58 +0000 (21:25 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
am:
0541862ec5
Change-Id: I0073d1eb75fc3460ad126ad08b9d4cf3f566a305
Lei Yu [Fri, 9 Jun 2017 21:17:14 +0000 (21:17 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
am:
883db32859
Change-Id: Ibb862780286006efb4a4a117f007cc652dac4ce9
Todd Lee [Fri, 9 Jun 2017 21:16:04 +0000 (21:16 +0000)]
Add missing values for screen percent width dimens am:
5fc6653ea7
am:
a58e208394
Change-Id: I0bd6a5e8fe67439d823068229f4bbd828560d7c1
jackqdyulei [Fri, 9 Jun 2017 21:15:56 +0000 (21:15 +0000)]
Copy smearing method to BatteryStatsHelper
am:
5dad8068e2
Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d
Lucas Dupin [Fri, 9 Jun 2017 21:10:33 +0000 (14:10 -0700)]
Removed test from presubmit.
testOnNotification_stillWorksAfterOneFailedProxCheck needs to
be ignored on presubmit runs. It fails on Tree Hugger but
runs locally.
Test: runtest systemui
Change-Id: Id4e1107528715c7e0b6ce7c69e2da7fa837e79a2
Todd Lee [Fri, 9 Jun 2017 21:07:04 +0000 (21:07 +0000)]
Add missing values for screen percent width dimens
am:
5fc6653ea7
Change-Id: Icecf451c5cb97275234f75f55292729a5f213560
Felipe Leme [Fri, 9 Jun 2017 21:05:39 +0000 (21:05 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am:
8db148093c
Change-Id: I8f0bfb221b17804d3f9ec7b682ebd1256f53aa76
Felipe Leme [Fri, 9 Jun 2017 20:59:53 +0000 (20:59 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am:
e4835a2af4
Change-Id: I43a0e7bec7328d7a272c74145817bf4d9a03b69a
Siyamed Sinir [Fri, 9 Jun 2017 20:58:30 +0000 (20:58 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
Chen Xu [Fri, 9 Jun 2017 20:57:02 +0000 (20:57 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am:
cdec393aa3
Change-Id: I657161b898c66efdf13c48c322e25cefc7733750
Ben Gruver [Thu, 8 Jun 2017 22:54:48 +0000 (15:54 -0700)]
Don't reset the value of package_verifier_enable if not in demo mode
Also, use the correct default value when querying the setting when
starting demo mode.
BUG:
62346506
Test: manually flash and run through setup wizard
Change-Id: Ie9a5ae8a998eb267fcf1f509cb93ea6f566b3c96
Svetoslav Ganov [Fri, 9 Jun 2017 20:53:26 +0000 (20:53 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
Lei Yu [Fri, 9 Jun 2017 20:50:36 +0000 (20:50 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
* changes:
Batterystats logs smeared power model values
Copy smearing method to BatteryStatsHelper
Hemant Gupta [Fri, 9 Jun 2017 20:50:16 +0000 (20:50 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am:
6f2b75f574
Change-Id: I9110d7fd8b687f3ee59e3d9ea5ef3319873cdf69
Dan Sandler [Fri, 9 Jun 2017 03:52:45 +0000 (23:52 -0400)]
🐙
It's convenient that this release is Android 8.
Bug:
32956843
Test: adb shell am start \
-a android.intent.action.MAIN \
-c com.android.internal.category.PLATLOGO
Change-Id: I9bb02b212fa241c17f03ef11c5c52dba0e6a746e
Felipe Leme [Fri, 9 Jun 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 19:42:13 +0000 (19:42 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
Chen Xu [Fri, 9 Jun 2017 19:39:50 +0000 (19:39 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 19:00:58 +0000 (12:00 -0700)]
Fix thread booster
We need to conditionally set the prevPriority only if we enter
the first locked section. Otherwise we'll never reset back to the
lower priorities.
Test: Make sure no binder threads are stuck at 110.
Test: go/wm-smoke
Bug:
36631902
Change-Id: I8a9c329bc3084371022da91eabee45943c1b8c9f
Todd Lee [Wed, 3 May 2017 23:22:42 +0000 (16:22 -0700)]
Add missing values for screen percent width dimens
Protects against bootlooping in the event that developer
inadvertently changes DPI to unsupported value for device.
Use 0dp as it will not be mistaken for anything other
than a broken experience (cts test to validate device DPIs
so as to avoid shipping with this).
bug: b/
37755288
Change-Id: Ie9f4aa0d6d226383824e06d28151e06038d0110b
Jordan Liu [Fri, 9 Jun 2017 19:04:48 +0000 (19:04 +0000)]
Merge "Add IApnSourceService.aidl" am:
1d5d409f6f
am:
7b78a176a9
Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a
Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.
Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
verified that connection and transfer happens over L2CAP.
Connected with Remote PBAP Client supporting PBAP 1.1 and
and verified that connection and transfer happens over RFCOMM.
TestTracker: 89053
Bug:
33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
(cherry picked from commit
9e91b62c1fa4f6c51f53ddb3f2155f345be30a2a)
Winson Chung [Fri, 9 Jun 2017 17:55:08 +0000 (17:55 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
am:
a0e44e7335
Change-Id: I39c832f1ff5b0905bb497c3970c4ce40dad237b8
Winson Chung [Fri, 9 Jun 2017 17:50:44 +0000 (17:50 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
Clara Bayarri [Fri, 9 Jun 2017 17:37:58 +0000 (17:37 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
am:
3eae564fec
Change-Id: Ied313294ca2de00f654e0c912717286f2725cc18
Jordan Liu [Fri, 9 Jun 2017 17:33:56 +0000 (17:33 +0000)]
Merge "Add IApnSourceService.aidl"
am:
1d5d409f6f
Change-Id: Id76c6c83d18482594730f7e584231f7f4714b46d
Clara Bayarri [Fri, 9 Jun 2017 17:31:14 +0000 (17:31 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
Jordan Liu [Fri, 9 Jun 2017 17:25:08 +0000 (17:25 +0000)]
Merge "Add IApnSourceService.aidl"
Bill Yi [Fri, 9 Jun 2017 16:08:19 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
728c610446 -s ours
Change-Id: I6b15bd645c0d70a710a45e213a95066e93be50b1
TreeHugger Robot [Fri, 9 Jun 2017 16:02:23 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Sungsoo Lim [Fri, 9 Jun 2017 15:44:33 +0000 (15:44 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am:
9cfd30202d
Change-Id: I4de9857958f30cfa251da56d20c07fcca8973d95
Sungsoo Lim [Fri, 9 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
Bill Yi [Fri, 9 Jun 2017 14:01:59 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I868ab44fa40985282a8a7b46ea94d951d18e4fd3
Auto-generated-cl: translation import
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am:
678477b383
Change-Id: If4da36399c68f7a91c0ab87d398eb3cdb70f2215
Wale Ogunwale [Fri, 9 Jun 2017 13:07:13 +0000 (13:07 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 11:47:25 +0000 (11:47 +0000)]
Merge "Revert "Instrument captive portal login activity"" am:
2921320517
am:
bbddbfc451
Change-Id: I0271fa4138ac9c4f1ddfea648c003a79909214df
Hugo Benichi [Fri, 9 Jun 2017 11:40:01 +0000 (11:40 +0000)]
Merge "Revert "Instrument captive portal login activity""
am:
2921320517
Change-Id: Iacae406a0998bb91c84b73a66ff383dfa8038665
Hugo Benichi [Fri, 9 Jun 2017 11:31:21 +0000 (11:31 +0000)]
Merge "Revert "Instrument captive portal login activity""
Hugo Benichi [Fri, 9 Jun 2017 11:30:05 +0000 (11:30 +0000)]
Revert "Instrument captive portal login activity"
This reverts commit
f867da14eaa194cb53b0726b50e570268e70f1d7.
Change-Id: Ic900c91ed87c2d65c151f8386954bd7b74128348
Bryce Lee [Fri, 9 Jun 2017 11:17:58 +0000 (11:17 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am:
ac56b8adde
Change-Id: Ib4fd790e9ee235b25ddde40d839c01e7685a2f12
Bryce Lee [Fri, 9 Jun 2017 11:11:12 +0000 (11:11 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
OSDN Git Service
