OSDN Git Service
Will Brazil [Tue, 13 Jun 2017 00:36:59 +0000 (00:36 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631 am:
5884f6ce0d
am:
308a19531e
Change-Id: I2db2e50ac8ca7b85429271eb649a2698041d1df0
Jorim Jaggi [Tue, 13 Jun 2017 00:34:49 +0000 (00:34 +0000)]
Merge "resolve merge conflicts of
963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am:
827dfe078f
Change-Id: Ibe3a988346ab28f5e74286d327194e2e9f2a67fd
Will Brazil [Tue, 13 Jun 2017 00:26:49 +0000 (00:26 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev am:
71029bf631
am:
5884f6ce0d
Change-Id: I725739aed3207992022aa500bb99072410a9a305
Jeff Sharkey [Tue, 13 Jun 2017 00:24:59 +0000 (00:24 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev am:
f7dc56ecc9
am:
de624f3fbb
Change-Id: I0a125a6c00220ba280dca4e0d8ece88202a68afe
Jorim Jaggi [Tue, 13 Jun 2017 00:20:35 +0000 (00:20 +0000)]
Merge "resolve merge conflicts of
963fed0345c5 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Tue, 13 Jun 2017 00:14:55 +0000 (00:14 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
am:
f7dc56ecc9
Change-Id: Ic66cdb0548cf8c973214364843cf147ac5d231be
Tarandeep Singh [Tue, 13 Jun 2017 00:12:02 +0000 (00:12 +0000)]
Merge "SearchView focus should be preserved in split-screen."
Jeff Sharkey [Tue, 13 Jun 2017 00:09:45 +0000 (00:09 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 00:00:41 +0000 (00:00 +0000)]
Merge "AAPT2: Clean up tests a bit"
Anthony Chen [Mon, 12 Jun 2017 23:27:48 +0000 (23:27 +0000)]
Merge "Handle night mode for notifications."
Tyler Gunn [Mon, 12 Jun 2017 22:53:17 +0000 (22:53 +0000)]
Merge changes from topic 'ims-handover-api' into oc-dr1-dev am:
e15da2649b
am:
0d14298f80
Change-Id: Ic21cc388f95e04d47ef93f522412bccfce49d58e
Tyler Gunn [Mon, 12 Jun 2017 22:46:58 +0000 (22:46 +0000)]
Merge changes from topic 'ims-handover-api' into oc-dr1-dev
am:
e15da2649b
Change-Id: I98a44fe768bdffaaaca742b1c9e8e10f42c73a90
Tyler Gunn [Mon, 12 Jun 2017 22:35:38 +0000 (22:35 +0000)]
Merge changes from topic 'ims-handover-api' into oc-dr1-dev
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
TreeHugger Robot [Mon, 12 Jun 2017 22:17:29 +0000 (22:17 +0000)]
Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers"
Jeff Sharkey [Mon, 12 Jun 2017 22:09:16 +0000 (22:09 +0000)]
Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev am:
3d4c62de10
am:
dd96cfc4ef
Change-Id: I02eab4f04913de48c182176da6559fb14559f459
Mady Mellor [Mon, 12 Jun 2017 22:06:46 +0000 (22:06 +0000)]
Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev am:
f3f6ddf7cb
am:
7fc5ab55bc
Change-Id: I918dad8f98f4f30329b2462ccffbdff06f5b4b3b
Jeff Sharkey [Mon, 12 Jun 2017 22:00:09 +0000 (22:00 +0000)]
Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev
am:
3d4c62de10
Change-Id: Iea3267aeea3c9633876cc055e45d095e0c5f1306
Mady Mellor [Mon, 12 Jun 2017 21:57:17 +0000 (21:57 +0000)]
Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev
am:
f3f6ddf7cb
Change-Id: I0147acff32fb79096617dff8080fab677d6c805e
TreeHugger Robot [Mon, 12 Jun 2017 21:50:51 +0000 (21:50 +0000)]
Merge "Revert work around clang-tidy segmentation fault."
Jeff Sharkey [Mon, 12 Jun 2017 21:50:33 +0000 (21:50 +0000)]
Merge "Hide APIs not intended to ship in DR." into oc-dr1-dev
Mady Mellor [Mon, 12 Jun 2017 21:48:38 +0000 (21:48 +0000)]
Merge "Updates to NotificationMenuRowPlugin so that long press may be captured" into oc-dr1-dev
Bill Yi [Mon, 12 Jun 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
66c8f60eb7 -s ours
am:
3e735ea914 -s ours
Change-Id: I279a9d403677327a42a993879f5c2fa4aa97a098
Android Build Merger (Role) [Mon, 12 Jun 2017 21:39:35 +0000 (21:39 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
fe84caad61 -s ours am:
6e96950a37 -s ours"
TreeHugger Robot [Mon, 12 Jun 2017 21:38:56 +0000 (21:38 +0000)]
Merge "In the stopping/shutdown state return unlock state of the user key"
Tarandeep Singh [Mon, 12 Jun 2017 19:45:57 +0000 (12:45 -0700)]
SearchView focus should be preserved in split-screen.
SearchView's focus should be preserved when entering or exiting
split-screen mode.
Fixes:
31444175
Test: Verified toggling split-screen preserves the focus.
Change-Id: If3a11a6877b4d091ac0559a5cc8775eef071de40
Bill Yi [Mon, 12 Jun 2017 21:37:12 +0000 (21:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
fe84caad61 -s ours
am:
6e96950a37 -s ours
Change-Id: Ic1e97fa2a8b271391c9e98d37929edc1fc06a9ed
TreeHugger Robot [Mon, 12 Jun 2017 21:34:21 +0000 (21:34 +0000)]
Merge "Deprecate screen brightness boost detection."
Bill Yi [Mon, 12 Jun 2017 21:32:23 +0000 (21:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
66c8f60eb7 -s ours
Change-Id: I16ea34198d95d7da16a3a07cf0da1aa9b2b3304e
Bill Yi [Mon, 12 Jun 2017 21:30:08 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
fe84caad61 -s ours
Change-Id: Ia5bf5f5b4f2534adf8ea60557494263f1eaef51b
TreeHugger Robot [Mon, 12 Jun 2017 21:24:43 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Mon, 12 Jun 2017 21:24:10 +0000 (21:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Anthony Chen [Mon, 10 Apr 2017 23:07:58 +0000 (16:07 -0700)]
Handle night mode for notifications.
When the system detects a night mode change, it will reload the
resources and relayout the notifications.
Also, allow the text in the Notification to take night mode into
account. Add configuration to allow Android Auto embedded to not tint
certain elements of the UI.
Test: booted on phone and Android Auto headunit
Bug:
33210494
Change-Id: I261813e5795b047bdfc4f77b88e1b01cc72e3216
TreeHugger Robot [Mon, 12 Jun 2017 21:16:18 +0000 (21:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Anthony Chen [Mon, 12 Jun 2017 21:12:38 +0000 (21:12 +0000)]
Merge "Add a method that allows the shade to be toggled."
TreeHugger Robot [Mon, 12 Jun 2017 21:11:05 +0000 (21:11 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 12 Jun 2017 20:57:47 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 12 Jun 2017 20:57:16 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 12 Jun 2017 20:55:33 +0000 (20:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Jorim Jaggi [Mon, 12 Jun 2017 20:52:31 +0000 (13:52 -0700)]
resolve merge conflicts of
963fed0345c5 to oc-dr1-dev-plus-aosp
Change-Id: Ife92b10f60b68cb5cfc970a52a248692c6342e17
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 [Fri, 9 Jun 2017 16:01:20 +0000 (10:01 -0600)]
Active camera apps can defy reserved cache space.
We normally prevent apps from allocating into the "reserved" cache
space, but this change makes an exception for an active camera app,
since the user is probably trying to capture an important memory.
This change only lets the active camera app clear up to half of the
reserved space, since we don't want to completely destroy the
experience of all other apps.
Test: manual app before/during/after active camera session
Bug:
38267830
Change-Id: Ie9e63884fb2638ca881e10b894629eea84601648
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
Fyodor Kupolov [Fri, 26 May 2017 00:06:17 +0000 (17:06 -0700)]
In the stopping/shutdown state return unlock state of the user key
UserManager.isUserUnlocked should return true when user is stopping,
but encryption key is unlocked. Otherwise it causes issues in
non-cryptoaware apps that can can run while user is in STATE_STOPPING
Test: create/start/remove managed profiles in a loop and verify there
are no app or system crashes
Bug:
38212686
Change-Id: I47aa520269aafe3d3c967b6841ff46e765c446bd
Amit Pawar [Mon, 12 Jun 2017 20:00:51 +0000 (20:00 +0000)]
Merge "Fix wake-and-unlock animation" into oc-dev
Felipe Leme [Mon, 12 Jun 2017 19:34:57 +0000 (19:34 +0000)]
Merge "Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975 am:
2f8647c4d1" into oc-dr1-dev-plus-aosp
am:
1072b62b15
Change-Id: I532d77e0780f22afcda16b1809821113a2db8be2
Felipe Leme [Mon, 12 Jun 2017 19:19:46 +0000 (19:19 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975 am:
5148d9fe81
am:
eb196c7542
Change-Id: I322fdf688a0d78c090db27a4c0fb6c32152a231c
TreeHugger Robot [Mon, 12 Jun 2017 19:16:42 +0000 (19:16 +0000)]
Merge "TIF: add TvContract.isRecordedProgramUri() method"
Android Build Merger (Role) [Mon, 12 Jun 2017 19:15:57 +0000 (19:15 +0000)]
Merge "Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975 am:
2f8647c4d1" into oc-dr1-dev-plus-aosp
Felipe Leme [Mon, 12 Jun 2017 19:13:42 +0000 (19:13 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975
am:
2f8647c4d1
Change-Id: Ice204340ffe9c2eba6fde4ccb133a9a96510cd25
Felipe Leme [Mon, 12 Jun 2017 19:13:38 +0000 (19:13 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev am:
7c41ddb975
am:
5148d9fe81
Change-Id: I7981171fd6b6f0bb6c019f64f418a3348bebcdc7
Bill Yi [Mon, 12 Jun 2017 19:11:39 +0000 (12:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb61023a779bccfe2c73653d9f6689b426eedcb7
Auto-generated-cl: translation import
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: Id74b4becd0f26d185cad3ecbe539aaa69f7ac89e
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
TreeHugger Robot [Mon, 12 Jun 2017 18:58:01 +0000 (18:58 +0000)]
Merge "Removed deprecated setExtras() method." into oc-dev
Bill Yi [Mon, 12 Jun 2017 18:52:00 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic9bdbdb26c3c04948374ee9aec9dd855d4d3e9ec
Auto-generated-cl: translation import
Bill Yi [Mon, 12 Jun 2017 18:47:44 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: If7f8b590d878dfbd97565b52d6353682221a2b39
Auto-generated-cl: translation import
Lucas Dupin [Mon, 12 Jun 2017 18:47:09 +0000 (18:47 +0000)]
Merge "Scrims should be grey when in-app"
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:43:41 +0000 (11:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I04a1ca378526cb10c0b162dda12264747b96fbcc
Auto-generated-cl: translation import
Bill Yi [Mon, 12 Jun 2017 18:30:54 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d2131b53492a99a196d0791e3b346e3079cece4
Auto-generated-cl: translation import
Mady Mellor [Tue, 6 Jun 2017 18:42:50 +0000 (11:42 -0700)]
Updates to NotificationMenuRowPlugin so that long press may be captured
This will allow the NotificationMenuRow plugin to do something else
rather than showing a menu when the view is long pressed.
- Allow menu to intercept touch events
- If the menu item provided to long press is null, don’t show it
- Also passes the status bar notification when the menu is created
or updated
Bug:
62534409
Test: manual, have no plugin and long press -> see notification info
have a plugin that returns null for long press -> nothing happens
Change-Id: I384c5217d5343e990f4c3506eb2477b015705e5c
Bill Yi [Mon, 12 Jun 2017 17:47:09 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1c7d49d4ee0b5b45cf1f7bdbf6da707921ccfde4
Auto-generated-cl: translation import
Bill Yi [Mon, 12 Jun 2017 17:22:50 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53c211e1477d522dfd6bff3e7f6e9a6c4e009b15
Auto-generated-cl: translation import
Geoffrey Pitsch [Mon, 12 Jun 2017 17:14:02 +0000 (17:14 +0000)]
Merge "Change FlakyTest to Ignores" into oc-dr1-dev am:
209705d5d7
am:
9fde4fcf26
Change-Id: I80d7220dcc849c01e2026019a585d08ee46f219b
Dianne Hackborn [Mon, 12 Jun 2017 17:08:46 +0000 (17:08 +0000)]
Merge "Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8 am:
d066c0c6cb" into oc-dr1-dev-plus-aosp
am:
c6e116cf81
Change-Id: Ic2b99979cf1a5cb1220554035bf54e7a10233ec7
Geoffrey Pitsch [Mon, 12 Jun 2017 17:06:26 +0000 (17:06 +0000)]
Merge "Change FlakyTest to Ignores" into oc-dr1-dev
am:
209705d5d7
Change-Id: I3e0ae84bf3b814b9a891c1909012c1fd4ae791ec
Dianne Hackborn [Mon, 12 Jun 2017 17:05:54 +0000 (17:05 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8 am:
5b3d0066bf
am:
bef027c3b4
Change-Id: I14502b54b7bb807bd43ae472d649511e2ef46b6d
Android Build Merger (Role) [Mon, 12 Jun 2017 17:00:41 +0000 (17:00 +0000)]
Merge "Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8 am:
d066c0c6cb" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Mon, 12 Jun 2017 16:59:23 +0000 (16:59 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8
am:
d066c0c6cb
Change-Id: I435c71537d41f94d4e9af2e07a9f2a9258f2eab5
Rajeev Kumar [Mon, 12 Jun 2017 16:58:45 +0000 (16:58 +0000)]
Merge "Fixes the apostrophe and its escaping for zen_priority_introduction, zen_alarms_introduction, zen_silence_introduction_voice, pip_notification_message"
Dianne Hackborn [Mon, 12 Jun 2017 16:57:12 +0000 (16:57 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8
am:
5b3d0066bf
Change-Id: If930e143df6621c1c68a74462d0b64e29e0ad2a9
TreeHugger Robot [Mon, 12 Jun 2017 16:56:24 +0000 (16:56 +0000)]
Merge "Change FlakyTest to Ignores" into oc-dr1-dev
Chris Thornton [Mon, 12 Jun 2017 16:54:59 +0000 (16:54 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0 -s ours am:
5375d9360f
am:
3f3237f4b1
Change-Id: Ica062edbc69050c8cfcf976aed06911f3e62be4e
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:47:19 +0000 (16:47 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
4eb76b2db8
Change-Id: I3aa5bbccbc669499a8ab6b12f180a7f5841164c3
Chris Thornton [Mon, 12 Jun 2017 16:46:58 +0000 (16:46 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0 am:
722550cc3c -s ours
am:
9252fe6925
Change-Id: I6c287fa3e59545e66d7c811adbbc4b1b08e6fe36
yawanng [Sun, 11 Jun 2017 04:38:29 +0000 (21:38 -0700)]
Revert work around clang-tidy segmentation fault.
Bug:
34740546
Test: build with WITH_TIDY=1 and
WITH_TIDY_CHECKS="*,-readability-*,-google-readability-*,-google-runtime-references"
Change-Id: Ie0885744bdf07d1a66792b61d8a49305162bcd71
Chris Thornton [Mon, 12 Jun 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0 -s ours
am:
5375d9360f
Change-Id: Ib2dd5a0264733ab829c2976eef29a68056aacc2c
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:38:33 +0000 (16:38 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0
am:
722550cc3c -s ours
Change-Id: Ia7ed4ded824000ecf111f4ec2886a50dea67fa76
Chris Thornton [Mon, 12 Jun 2017 16:37:03 +0000 (16:37 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am:
484fb951e0 -s ours
Change-Id: I97dc24bc38e194b508a1b485ec4d7e1f8b62285d
Jeff Sharkey [Fri, 9 Jun 2017 17:37:02 +0000 (11:37 -0600)]
Hide APIs not intended to ship in DR.
This CL will be reverted once it merges into the next release branch
to re-introduce the proposed APIs.
This CL also makes the following code changes to preserve API
compatibility:
-- It keeps the recently added RemoteViews.clone() synchronized logic
intact, but moves it inside the method to avoid changing the API
signature.
-- It reverts the RttCall.read() behavior to the oc-dev logic, since
we can't throw IOException until we get an API level bump. (The
original logic returned null instead of throwing.)
Test: builds, boots
Bug:
62427252,
62431886,
62427329
Bug:
62468911,
62431162,
62428935,
62429096
Bug:
37290820,
37359238,
36886243
Bug:
30143923,
35761231,
62192626,
29829689
Change-Id: I83d723f598cb0ee1fe198e65debd86ef7fd0420c
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
Evan Laird [Mon, 12 Jun 2017 15:57:47 +0000 (15:57 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev am:
e1f9b3f195
am:
1e830567a5
Change-Id: I0c455086e88ed0809431a3c8d88ad72d30764625
Chris Thornton [Mon, 12 Jun 2017 15:54:24 +0000 (15:54 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
Evan Laird [Mon, 12 Jun 2017 15:49:52 +0000 (15:49 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev
am:
e1f9b3f195
Change-Id: Ie5974f71084b99c27decadd0522af2a8a46e304d
TreeHugger Robot [Mon, 12 Jun 2017 15:42:14 +0000 (15:42 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev
Geoffrey Pitsch [Mon, 12 Jun 2017 14:55:28 +0000 (10:55 -0400)]
Change FlakyTest to Ignores
These are failing reliably, no need for FlakyTest
Bug:
62475085
Test: runtest systemui
Change-Id: Ib9abedda149976cffe07ea75c7034dd290d1f715
Lorenzo Colitti [Mon, 12 Jun 2017 12:48:15 +0000 (12:48 +0000)]
Merge "Change the multipath hint default to 0. am:
d1e7d3d73e am:
9620595965" into oc-dr1-dev-plus-aosp
am:
2c23595e7d
Change-Id: Id34d998fd3ed61559faac301b94e16fb95f13f2f
Lorenzo Colitti [Mon, 12 Jun 2017 12:43:07 +0000 (12:43 +0000)]
Change the multipath hint default to 0. am:
d1e7d3d73e am:
896a0065a6
am:
dc5fb1ffe1
Change-Id: Ibc9bac6776e5c3114e3f771e05692e0fc3c2a825
Android Build Merger (Role) [Mon, 12 Jun 2017 12:39:40 +0000 (12:39 +0000)]
Merge "Change the multipath hint default to 0. am:
d1e7d3d73e am:
9620595965" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Mon, 12 Jun 2017 12:37:13 +0000 (12:37 +0000)]
Change the multipath hint default to 0. am:
d1e7d3d73e
am:
9620595965
Change-Id: Icf1707e4a179bf8835ec9f7be031e9a74e638625
Lorenzo Colitti [Mon, 12 Jun 2017 12:37:07 +0000 (12:37 +0000)]
Change the multipath hint default to 0. am:
d1e7d3d73e
am:
896a0065a6
Change-Id: Ie6611ee7f9169a53132a6e664814bc579d70170d
Lorenzo Colitti [Mon, 12 Jun 2017 12:29:31 +0000 (12:29 +0000)]
Change the multipath hint default to 0.
am:
d1e7d3d73e
Change-Id: Iab590e33a1ae64701f0023970d53b23470533962
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
Erik Kline [Mon, 12 Jun 2017 05:20:43 +0000 (05:20 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev am:
cdb134c012 -s ours
am:
9f409ae862 -s ours
Change-Id: I32aee4d72cd8ee471498e5d04a180d0dafc03332
Erik Kline [Mon, 12 Jun 2017 05:13:17 +0000 (05:13 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev
am:
cdb134c012 -s ours
Change-Id: I6715134fe1883dc2d4613b38478d60f0ad2c33fe
OSDN Git Service
