OSDN Git Service
Jeff Sharkey [Tue, 6 Dec 2016 23:47:00 +0000 (16:47 -0700)]
Fix two StrictMode stack collection bugs.
When Binder calls are nested, we can quickly end up with a snowball
of stacktraces that can cause the original transaction to fail. This
CL makes two specific changes to alleviate this pressure:
-- Consider a nested Binder call from PID A -> B -> C. If both B and
C encounter dozens of StrictMode violations, then gatheredViolations
in B will end up with 10 ViolationInfo (5 from B and 5 from C). This
problem only grows with each successive nested call. To solve this,
always limit ourselves to only ever write out 3 ViolationInfo from
any given process.
-- CrashInfo already nicely truncates any large stack traces to 20kB,
but readAndHandleBinderCallViolations() blindly appends the entire
local trace, and never considers truncating again. Similar to the
first problem above, nested calls can quickly cause the stackTrace
value to explode in size. To solve this, we always re-truncate the
stackTrace value after appending our local stack.
Also fix some NPE bugs when missing crashInfo.
(cherry-picked from commit
58f27b5033542150a78fb050e2f85253a48efa67)
Test: builds, boots
Bug:
32575987
Change-Id: Ie8373ca277296f920f2b1c564d419c702a8ee0f2
TreeHugger Robot [Wed, 7 Dec 2016 02:24:34 +0000 (02:24 +0000)]
Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev
Felipe Leme [Mon, 5 Dec 2016 18:51:30 +0000 (10:51 -0800)]
Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.
Change-Id: I84dc652f7297c2b8c9351e737074ddf43754718d
Fixes:
32950329
Test: manually verified it
Jordan Liu [Tue, 6 Dec 2016 22:23:23 +0000 (22:23 +0000)]
Merge "Treat the mdn as an additional voicemail number" into nyc-mr2-dev
Pankaj Kanwar [Tue, 6 Dec 2016 20:35:50 +0000 (20:35 +0000)]
Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev
Yuanlang Song [Tue, 6 Dec 2016 20:13:48 +0000 (20:13 +0000)]
Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev
am:
647166e852
Change-Id: I8985e69d3e04f0da6b923cf15db418338ac4edab
John Reck [Tue, 6 Dec 2016 20:13:45 +0000 (20:13 +0000)]
DO NOT MERGE: Add TouchLatency test
am:
91e2e7f460
Change-Id: I84a284f0316f68c24352178685eaa07f2b259411
Yuanlang Song [Tue, 6 Dec 2016 20:05:43 +0000 (20:05 +0000)]
Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev
pkanwar [Tue, 6 Dec 2016 18:09:37 +0000 (10:09 -0800)]
DO NOT MERGE: Add notification delay for when the user needs cannot register to a
network and needs to be notified.
BUG:
28572539
Change-Id: Iabf5e4476a1c5b02d1de38695f7125ee888dadd9
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:45 +0000 (18:32 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev
am:
ad7c7acad6
Change-Id: Ibc7e4c27b65f87c3b9396b7ae668ed9f55af6f79
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:42 +0000 (18:32 +0000)]
Centre clock text on visible characters instead of : character
am:
45a7644004
Change-Id: I8cf50fd314442a1e42a4cdd4c3f058d680c531dd
TreeHugger Robot [Tue, 6 Dec 2016 18:25:27 +0000 (18:25 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev
TreeHugger Robot [Tue, 6 Dec 2016 15:19:52 +0000 (15:19 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev
Michal Karpinski [Tue, 6 Dec 2016 10:16:32 +0000 (10:16 +0000)]
Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
* changes:
DO NOT MERGE Add connect event reporting
DO NOT MERGE Extending DNS event reporting
Ned Burns [Tue, 6 Dec 2016 02:33:28 +0000 (02:33 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am:
3601d3c239
Change-Id: I1ec2e39a533dcd6aefc5cd337be1be45b1a75dff
Ned Burns [Tue, 6 Dec 2016 02:33:13 +0000 (02:33 +0000)]
Modify SwipeDismissLayout to perform its own exit animation
am:
7d6cb913de
Change-Id: I17d086e1c24d9eb91a984c45b88f529006465d34
Ned Burns [Tue, 6 Dec 2016 02:26:40 +0000 (02:26 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
Michael Kwan [Tue, 6 Dec 2016 02:11:41 +0000 (02:11 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
am:
7f2554cfb7
Change-Id: I98f41654b423c85cb940560a8251e67143fc0e82
Michael Kwan [Tue, 6 Dec 2016 02:11:38 +0000 (02:11 +0000)]
Revert "Change activity dismiss animation to move left to right."
am:
ac9443ef9c
Change-Id: I92a48596e4ef5d24591cc063525ad719c24207a8
Elliot Waite [Tue, 6 Dec 2016 02:06:13 +0000 (02:06 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7
am:
5a701867d5
Change-Id: I7f5b828bd0d68f58c96765be05eb851f45d7677d
Elliot Waite [Tue, 6 Dec 2016 02:05:14 +0000 (02:05 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb
am:
c67ea5e3ff
Change-Id: If9c3962ac88678359e687623fc56cfcd803910bc
TreeHugger Robot [Tue, 6 Dec 2016 02:04:26 +0000 (02:04 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
Damien Bargiacchi [Tue, 6 Dec 2016 02:02:18 +0000 (18:02 -0800)]
Centre clock text on visible characters instead of : character
Bug:
33340845
Change-Id: I235ad7c6aafc62daa55242f81df2d076f27c56df
Elliot Waite [Tue, 6 Dec 2016 01:59:16 +0000 (01:59 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
am:
050cf854c7
Change-Id: Ibf58c209a59a7e9dc64976bafb5f4f9bfaa9a840
Elliot Waite [Tue, 6 Dec 2016 01:59:12 +0000 (01:59 +0000)]
Change insecure HTTP resource link to scheme-relative link.
am:
fc175c08cb
Change-Id: Ib5501d311ed6ee620d81b8399334097ea4c432a2
Elliot Waite [Tue, 6 Dec 2016 01:52:08 +0000 (01:52 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
John Reck [Mon, 8 Aug 2016 19:25:59 +0000 (12:25 -0700)]
DO NOT MERGE: Add TouchLatency test
Change-Id: Ic3a788f6b06bf6477ab23b183fb8c76ae8870b6b
(cherry picked from commit
d136ce902c0be4a0cfb8e9d1288ba931ceaf88b4)
Alan Viverette [Tue, 6 Dec 2016 01:02:03 +0000 (01:02 +0000)]
Merge "Show popup transitions when there is no anchor set" into nyc-mr2-dev
Ned Burns [Fri, 2 Dec 2016 22:25:33 +0000 (17:25 -0500)]
Modify SwipeDismissLayout to perform its own exit animation
Instead of relying on the window animation system, in the special
case of a swipe-dismiss, disable any default window exit animation
and perform a custom animation. This bypasses some bugs in the
window animator codebase and allows us to have a nice "rebound"
animation if the user doesn't swipe far/fast enough to trigger a
dismiss.
Bug:
33041168
Change-Id: Ied45700d35a59950bacef1ba0650eaa5bc60fadb
Adrian Roos [Mon, 5 Dec 2016 23:37:46 +0000 (23:37 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 22:41:19 +0000 (22:41 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
Christine Franks [Mon, 5 Dec 2016 22:38:10 +0000 (22:38 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 21:21:58 +0000 (21:21 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev
Shunta Sato [Wed, 12 Oct 2016 09:35:17 +0000 (18:35 +0900)]
Avoid NPE around mReusedTask of ActivityStarter
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.
Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.
Solutions:
Call performClearTaskLocked() before assigning
intentActivity.task to mReusedTask.
Bug:
32361138
Test: builds, boots, Manual testing of condition in bug
Author: Shigeki Yokomichi <shigeki.x.yokomichi@sonymobile.com>
Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
(cherry picked from commit
0bd28e2c5f7fd7e4448ae489b425e4e5cee57f9a)
Svet Ganov [Mon, 5 Dec 2016 17:03:24 +0000 (09:03 -0800)]
[DO NOT MERGE] Allow multiple toasts for the focused app
We don't allow apps to add multiple toast windows to
prevent an attacker to keep adding the same toast as
a workaround for our measure to ensure toast windows
are removed after a timeout. The may cause backwards
compatibility issue for apps that add multiple toasts.
While we need to fix the security vulnerability it is
desirable to make the fix as backwards compatible as
possible. This change allows the focused app to add
as many toast windows as it wants since they will be
removed after the timeout and once the app is not the
one the user uses it will lose the multiple toast add
capability.
bug:
30150688
Change-Id: I2d9295926cb49b5bb80c7af2546872ff8ca22c64
Xiaohui Chen [Mon, 5 Dec 2016 19:20:16 +0000 (19:20 +0000)]
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev
Christine Franks [Wed, 30 Nov 2016 17:33:07 +0000 (09:33 -0800)]
TwilightService: Ignore (0,0) coordinate location updates
Location providers may erroneously return (0.0, 0.0) when they
fail to determine the device's location. These location updates
can be safely ignored since the chance of a user actually being
at these coordinates is quite low.
Bug:
31009261
Test: added TwilightServiceTest; both tests pass
Change-Id: Ie9d7d10f81ade9b0be10f98ed74978539efaa658
Jordan Liu [Wed, 9 Nov 2016 21:23:42 +0000 (13:23 -0800)]
Treat the mdn as an additional voicemail number
Use carrier config to specify whether the carrier treats the mdn as an
additonal voicemail number.
Change-Id: I7192a3505da87d6b50a100e041d2b502cf37e113
Merged-In: I7192a3505da87d6b50a100e041d2b502cf37e113
Fix:
29145323
Test: build and flash on device
Bill Yi [Mon, 5 Dec 2016 18:35:35 +0000 (18:35 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
Bill Yi [Mon, 5 Dec 2016 18:35:00 +0000 (18:35 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
52ae3289fba02b03b7cb74afad628b9c80253045.
Change-Id: I629775ecf2470e8a16eb58df5cb1e8406865a6ba
TreeHugger Robot [Mon, 5 Dec 2016 18:23:53 +0000 (18:23 +0000)]
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
Michael Kwan [Mon, 5 Dec 2016 18:09:07 +0000 (18:09 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs.
am:
f7964be938
Change-Id: I4a6cad65f91368393272cd8f7d6012d131ec56ff
Alan Viverette [Mon, 5 Dec 2016 15:56:18 +0000 (10:56 -0500)]
Show popup transitions when there is no anchor set
Allow anchorRoot to be null when starting exit transition. Pushes
epicenter callback creation into startExitTransition. Adds nullability
annotations.
Bug:
33035511
Test: PopupWindowTest#testEnterExitTransition
Change-Id: Ie752a0d6b29d5eb11c160771d8a78fa6234de5bb
Michael Kwan [Sat, 3 Dec 2016 19:33:27 +0000 (11:33 -0800)]
Revert "Change activity dismiss animation to move left to right."
This reverts commit
6d969ea4d86918ce8e2e3fb6618527c55f0c05da.
Change-Id: I39ab1bc00d20b6a719ac0930e5596e14fd8345b7
Bill Yi [Sat, 3 Dec 2016 08:20:58 +0000 (00:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifb7cde4b8e869f98f49a2fb0270bc9cd30ed7b0d
Auto-generated-cl: translation import
Michael Kwan [Thu, 1 Dec 2016 00:44:33 +0000 (16:44 -0800)]
Disable swipe-to-dismiss for not cancelable dialogs.
Bug:
33249829
Change-Id: Ib3d2c9982ece22d1b080b821eaf306f6b686d099
Tenghui Zhu [Fri, 2 Dec 2016 22:25:02 +0000 (22:25 +0000)]
Merge "Update the documentation related to VD / AVD" into nyc-mr2-dev
Xiaohui Chen [Tue, 29 Nov 2016 23:10:04 +0000 (15:10 -0800)]
sysui: fix navbar button view orientation
Before navbar assumes rotation 0 means portrait and rotation 90
means landscape. This is not necessarily true, in certain devices
the natural orientation (0) is landscape. Here we removed that
assumption and make sure we use the right inflater at all times.
Bug:
32516898
Change-Id: I325b8f61877827b19aa5b7b5cda49cb3523d2ed6
Merged-in: I3db44dcb35d8511fb9d42b147b2bd137ff0750f7
Xiaohui Chen [Tue, 22 Nov 2016 18:34:38 +0000 (10:34 -0800)]
Fix vertical nav button direction issue
Bug:
32516898
Change-Id: I00d5478b9bef87918d59f3021a9368fd3f2e0c20
Test: locally on device
Merged-In: Id94f08c066db101f630e69874bcdefb177e6f0f5
Jeff Sharkey [Fri, 2 Dec 2016 20:37:55 +0000 (20:37 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7 am:
4aacfce724
am:
5b64f51a1c
Change-Id: I6434ed9331a3a34d15fb4628bf1979508de161b8
Jeff Sharkey [Fri, 2 Dec 2016 20:36:51 +0000 (20:36 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803 am:
6786309c03
am:
a43ee01a6d
Change-Id: I1a332bdc9c87dfe5f4d23d7aaa885bae5d7434bb
Jeff Sharkey [Fri, 2 Dec 2016 20:35:56 +0000 (20:35 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc am:
d12e48494d
am:
341813c852
Change-Id: Ia32a4880fc1c050122050099660d23322a51bbcc
Jeff Sharkey [Fri, 2 Dec 2016 20:35:06 +0000 (20:35 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb am:
383e0cfa06 am:
a55258bd17
am:
2f48a6ce63
Change-Id: Ie9f87cf495bc3ffbdba03dc2ee5f2933790883d0
Jeff Sharkey [Fri, 2 Dec 2016 20:20:39 +0000 (20:20 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3 am:
1d752340a7
am:
4aacfce724
Change-Id: I954a47982a94c14abeeee205015423b9d6c19cea
Jeff Sharkey [Fri, 2 Dec 2016 20:19:28 +0000 (20:19 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436 am:
43b3a13803
am:
6786309c03
Change-Id: Ie17a80be06549016951ff91792586e1dc2e004cc
Jeff Sharkey [Fri, 2 Dec 2016 20:18:32 +0000 (20:18 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f am:
09960bdfcc
am:
d12e48494d
Change-Id: I32c59ff8fd27596728ba87180cdf8e0c06d0d6ba
Jeff Sharkey [Fri, 2 Dec 2016 20:17:33 +0000 (20:17 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb am:
383e0cfa06
am:
a55258bd17
Change-Id: Idc5bde3158245925645d1ab69115df561922a758
TreeHugger Robot [Fri, 2 Dec 2016 20:14:09 +0000 (20:14 +0000)]
Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev
* changes:
Add capability flag for 802.11r fast BSS transition
Add constants for 802.11r
Jakub Pawlowski [Fri, 2 Dec 2016 20:14:00 +0000 (20:14 +0000)]
Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev
* changes:
BLE OOB Pairing - parse address type (5/5)
Fix Bluetooth OOB pairing not working for unseen devices
Add LE Secure Connection data parsing (1/4)
Jeff Sharkey [Fri, 2 Dec 2016 20:11:33 +0000 (20:11 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf am:
56247334f8 am:
923aef8e02 -s ours am:
f199d511c3
am:
1d752340a7
Change-Id: Ie7b1d07a622a9b5be4e0d5d9b08b33b821b8e43a
Jeff Sharkey [Fri, 2 Dec 2016 20:10:37 +0000 (20:10 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours am:
0eaa192436
am:
43b3a13803
Change-Id: I5f4f250100c3b9f63149add16f0086c77ccdf7ca
Jeff Sharkey [Fri, 2 Dec 2016 20:09:34 +0000 (20:09 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours am:
3fa188bd8f
am:
09960bdfcc
Change-Id: Ib66ff9a9e82f9ed3e7e291c0bcca1be9d4f38805
Jeff Sharkey [Fri, 2 Dec 2016 20:08:37 +0000 (20:08 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours am:
836b54e6bb
am:
383e0cfa06
Change-Id: I231c3a499177db213b0406ea84e7ea3c224f132d
Jeff Sharkey [Fri, 2 Dec 2016 19:55:09 +0000 (19:55 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf am:
56247334f8 am:
923aef8e02 -s ours
am:
f199d511c3
Change-Id: I990a5459cd64bbc0e2ede2d3b5899163d12818f4
Jeff Sharkey [Fri, 2 Dec 2016 19:54:12 +0000 (19:54 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a am:
acfda3d71a -s ours
am:
0eaa192436
Change-Id: Ie0fe9fd6770c94d56b3af10902c44c52d9a2f2a3
Jeff Sharkey [Fri, 2 Dec 2016 19:53:09 +0000 (19:53 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a am:
7e54dc58d4 -s ours
am:
3fa188bd8f
Change-Id: Ibae31cd6439c2fdfcc9d333ca23bd466a7730218
Jeff Sharkey [Fri, 2 Dec 2016 19:52:04 +0000 (19:52 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7 am:
cd35e746dc -s ours
am:
836b54e6bb
Change-Id: Ib546b18b5373aaf8e429a3e8668a23a9d3b5c411
Jeff Sharkey [Fri, 2 Dec 2016 19:51:21 +0000 (19:51 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9" into cw-f-dev
am:
2e73db5b9c
Change-Id: I0d230d279eb3fad10e46dbb3c469d770a80482e8
Jeff Sharkey [Fri, 2 Dec 2016 19:47:38 +0000 (19:47 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9
am:
17d6ba41b8
Change-Id: Idb7d2abaaf9809afd070e012dca6988ced2bf22c
Jeff Sharkey [Fri, 2 Dec 2016 19:46:36 +0000 (19:46 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf am:
56247334f8
am:
923aef8e02 -s ours
Change-Id: Ia0d0ac5ed1f8a84bd9158530fde499f91ac7f411
Jeff Sharkey [Fri, 2 Dec 2016 19:46:22 +0000 (19:46 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9
am:
5bf382063d
Change-Id: Ibef588aa9d1b61c31bb2c0ecfada658ed2574981
Jeff Sharkey [Fri, 2 Dec 2016 19:45:33 +0000 (19:45 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325 am:
a51ebb828a
am:
acfda3d71a -s ours
Change-Id: I0857c3cdd2e471ad04dbafc22a7898168a615a24
Jeff Sharkey [Fri, 2 Dec 2016 19:45:19 +0000 (19:45 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba am:
0891ca2fad am:
12b2f8a275
am:
71e4281969
Change-Id: I61d48d60faa4b8a7e06a72df277f5f2a5180de92
Jeff Sharkey [Fri, 2 Dec 2016 19:44:38 +0000 (19:44 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e am:
948841362a
am:
7e54dc58d4 -s ours
Change-Id: I3dce2baad70e1d9d606c27534f4ff4e9435f2445
Jeff Sharkey [Fri, 2 Dec 2016 19:44:25 +0000 (19:44 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours am:
aeeb9c8470 am:
8c74832d5e am:
07ad2a9063
am:
a75ce3a705
Change-Id: Ic4004d4923cc544a4babc457bc5cdb024bc9ee51
Jeff Sharkey [Fri, 2 Dec 2016 19:43:33 +0000 (19:43 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0 am:
d081cb0ab7
am:
cd35e746dc -s ours
Change-Id: I12608bbd9173dc053df967174bc59f9297a151c2
Jeff Sharkey [Fri, 2 Dec 2016 19:43:28 +0000 (19:43 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb am:
8165a22f53 am:
270d1c27ac
am:
10cdb1130e
Change-Id: Idfe644ae174419c698987de336e072208468866f
Android Build Merger (Role) [Fri, 2 Dec 2016 19:33:09 +0000 (19:33 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929 am:
f00515f4d9" into cw-f-dev
Jeff Sharkey [Fri, 2 Dec 2016 19:32:36 +0000 (19:32 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929
am:
f00515f4d9
Change-Id: I667f20343f23366c2530a5ea658a5414c45f2799
Jeff Sharkey [Fri, 2 Dec 2016 19:29:15 +0000 (19:29 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6 am:
37ff2d56bf
am:
56247334f8
Change-Id: I8bf5769fbb68fb10a4acd2c557dc1c66a3c448df
Jeff Sharkey [Fri, 2 Dec 2016 19:29:14 +0000 (19:29 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1 am:
398cdb6929
am:
f00515f4d9
Change-Id: Iafa9dd90fe36a10d781d92d236faa671178b2737
Jeff Sharkey [Fri, 2 Dec 2016 19:28:18 +0000 (19:28 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e am:
5267b63325
am:
a51ebb828a
Change-Id: Ic67fac2e28ab776632a98e3556c46826d7335a91
Jeff Sharkey [Fri, 2 Dec 2016 19:28:14 +0000 (19:28 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba am:
0891ca2fad
am:
12b2f8a275
Change-Id: I5d2e9c9faa81ddc2c1f29d10aaa8ef7567209969
Jeff Sharkey [Fri, 2 Dec 2016 19:27:26 +0000 (19:27 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours am:
aeeb9c8470 am:
8c74832d5e
am:
07ad2a9063
Change-Id: Ia05929a5edcc75490d8388008380d5db8f7edc85
Jeff Sharkey [Fri, 2 Dec 2016 19:27:23 +0000 (19:27 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8 am:
c130d7fd5e
am:
948841362a
Change-Id: I66fdc5fb2ca169453b6b2f5dc7d6c10360aea709
Jeff Sharkey [Fri, 2 Dec 2016 19:26:31 +0000 (19:26 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb am:
8165a22f53
am:
270d1c27ac
Change-Id: I426e531fd2fda1e09276dcfdc774fb548eedbefd
Jeff Sharkey [Fri, 2 Dec 2016 19:26:28 +0000 (19:26 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b am:
8b5fa0c0c0
am:
d081cb0ab7
Change-Id: I3fc3458a9050e1ee9cb57b9348d67ccd3ce71037
Jeff Sharkey [Fri, 2 Dec 2016 19:21:21 +0000 (19:21 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours am:
99b97e5ed1
am:
398cdb6929
Change-Id: I40a0cb7f416d843b12893656d16dfed97d0df058
Jeff Sharkey [Fri, 2 Dec 2016 19:20:23 +0000 (19:20 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours am:
c067e76bba
am:
0891ca2fad
Change-Id: I2e9897c052ee296d68beb50b6ac927e5a0d92daa
Jeff Sharkey [Fri, 2 Dec 2016 19:19:29 +0000 (19:19 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours am:
aeeb9c8470
am:
8c74832d5e
Change-Id: I35d8c2faba5a6f359bbe51b56052bafe90a6cac1
Jeff Sharkey [Fri, 2 Dec 2016 19:18:31 +0000 (19:18 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb
am:
8165a22f53
Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b
Jeff Sharkey [Fri, 2 Dec 2016 19:13:31 +0000 (19:13 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours am:
ce477912a2 am:
920b02a94f -s ours am:
aff9286bd6
am:
37ff2d56bf
Change-Id: I0ff63a0da9300799a8df538fcefaf0d27ea2be00
Jeff Sharkey [Fri, 2 Dec 2016 19:12:33 +0000 (19:12 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours am:
9277cce7fa am:
a1d1ecbe05 -s ours am:
928c09cd8e
am:
5267b63325
Change-Id: I3cab573840604be9c44e85998c4b1a579d07aee4
Jeff Sharkey [Fri, 2 Dec 2016 19:12:00 +0000 (19:12 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b am:
26f78f5836 -s ours
am:
99b97e5ed1
Change-Id: I1812de0dd036142fae97145361fdf5da50e61536
Jeff Sharkey [Fri, 2 Dec 2016 19:11:29 +0000 (19:11 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am:
6b89229d14 am:
a7efe16fe1 -s ours am:
f1085f2dc8
am:
c130d7fd5e
Change-Id: I15e9c5f864ec67c8bf5901fcc46abe0c7b362a6e
Jeff Sharkey [Fri, 2 Dec 2016 19:10:36 +0000 (19:10 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
4ddbf942a0 am:
190e20c2b5 am:
74b36307a0 am:
4ad177829a -s ours
am:
c067e76bba
Change-Id: I36e17906c43408126d1acabde89bf7ec04e16aab
Jeff Sharkey [Fri, 2 Dec 2016 19:10:35 +0000 (19:10 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
91add43ae7 am:
792d49dfb5 -s ours am:
32af84320b
am:
8b5fa0c0c0
Change-Id: Ie5bb120bcd900c2032e47f0ae3e1c710c083ae2e
Jeff Sharkey [Fri, 2 Dec 2016 19:03:40 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am:
8e14278209 am:
a80cbeeee2 am:
44e8914f8b
am:
26f78f5836 -s ours
Change-Id: I6521af4ca816ed3b03e6954159276971a55d349c
Jeff Sharkey [Fri, 2 Dec 2016 19:03:36 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours
am:
aeeb9c8470
Change-Id: I886018e68c75bb833d0a18c76f6db557b1b9c9e8
Jeff Sharkey [Fri, 2 Dec 2016 19:03:28 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am:
0be332852e -s ours am:
b685f719f1 am:
45b6a52225 am:
34b87d94e4
am:
30ef1ad5be
Change-Id: I2b58aa2e0123c5ab4e8c4fd81511984def099248