OSDN Git Service
Todd Kennedy [Mon, 26 Jun 2017 20:13:41 +0000 (20:13 +0000)]
Merge "Filter instant apps with different names" into oc-dev
am:
adcc94f160
Change-Id: I855a58e6ea0655b4211f2aac0a4a1f9f94f639f2
Jason Monk [Mon, 26 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
am:
aa2286e417
Change-Id: I40a6e211fa02a83de09edcfac419b8e78a287e2f
TreeHugger Robot [Mon, 26 Jun 2017 20:06:19 +0000 (20:06 +0000)]
Merge "Filter instant apps with different names" into oc-dev
TreeHugger Robot [Mon, 26 Jun 2017 19:59:20 +0000 (19:59 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
Chet Haase [Mon, 26 Jun 2017 18:18:46 +0000 (18:18 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
am:
7b95c932d6
Change-Id: I9ec629e60882aec2b4ca84b0b81de4244d43afef
Chet Haase [Mon, 26 Jun 2017 18:07:25 +0000 (18:07 +0000)]
Merge "Fix TimePicker RTL issues" into oc-dev
Todd Kennedy [Mon, 26 Jun 2017 17:34:41 +0000 (10:34 -0700)]
Filter instant apps with different names
ag/
2447596 introduced a regression that caused instant apps to be
made visible to one another.
Change-Id: I5db9a43f05dd5bec991cc0934b1c9a9406dfade6
Fixes:
62998487
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Jason Monk [Mon, 26 Jun 2017 15:22:21 +0000 (11:22 -0400)]
Fix QS lock screen animation
Now that we have a footer, heights and clippings need to be adjusted
to be more accurate.
- Clip QS within its layout box regardless of its y translation
- Calculate height diffs correctly
Test: visual
Change-Id: Ic46996e342cd1000215aa9256da920a7856bb5a4
Fixes:
62489284
Ying Xu [Mon, 26 Jun 2017 17:27:21 +0000 (17:27 +0000)]
Merge "Fix the inconsistency of scan status." am:
41be35a1bd
am:
ac2d00a195
Change-Id: Ibcdbe63349031ea95d137dd18465bec5de6efd7a
Ying Xu [Mon, 26 Jun 2017 17:18:42 +0000 (17:18 +0000)]
Merge "Fix the inconsistency of scan status."
am:
41be35a1bd
Change-Id: Ic92aa1aa9ecd91cd072257c93e12cdf030cdeba8
Todd Kennedy [Mon, 26 Jun 2017 17:10:13 +0000 (17:10 +0000)]
Merge "null check before dereference" into oc-dev
am:
df8569787c
Change-Id: I41f9298e305f6f197120f2b3128187a4cbf6b28a
Ying Xu [Mon, 26 Jun 2017 17:05:57 +0000 (17:05 +0000)]
Merge "Fix the inconsistency of scan status."
TreeHugger Robot [Mon, 26 Jun 2017 16:59:31 +0000 (16:59 +0000)]
Merge "null check before dereference" into oc-dev
Pankaj Kanwar [Mon, 26 Jun 2017 15:55:46 +0000 (15:55 +0000)]
Merge "Carrier Config changes to support IMSI encryption." am:
1caaa514c9
am:
e26191a81c
Change-Id: I777010e6fea82f237ddf224525739a5687f13a2c
Pankaj Kanwar [Mon, 26 Jun 2017 15:48:03 +0000 (15:48 +0000)]
Merge "Carrier Config changes to support IMSI encryption."
am:
1caaa514c9
Change-Id: Ia9c4d93e8ababf87a0d6027a4322e73111651844
Pankaj Kanwar [Mon, 26 Jun 2017 15:36:43 +0000 (15:36 +0000)]
Merge "Carrier Config changes to support IMSI encryption."
Neil Fuller [Mon, 26 Jun 2017 15:01:37 +0000 (15:01 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method" am:
fe0b43cb1e
am:
6b5d71f7e5
Change-Id: Ib4d97f72a9fa936beb47267c9e9a888e306ed0e5
Neil Fuller [Mon, 26 Jun 2017 14:53:58 +0000 (14:53 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method"
am:
fe0b43cb1e
Change-Id: I8c263ce15bf29b8a14c862d9acae377ba9be77c3
Todd Kennedy [Mon, 26 Jun 2017 14:51:54 +0000 (07:51 -0700)]
null check before dereference
Change-Id: I6ae219b68920c160e104b307f60802fd75e705ce
Fixes:
62908319
Test: Manual
Paul Duffin [Mon, 26 Jun 2017 14:43:13 +0000 (14:43 +0000)]
Merge "Remove a.t.TestCase" am:
3c5ab7d324
am:
930ab689f0
Change-Id: I0d61b4e26c9551d177b5bb7bbdaab25885976c0d
Treehugger Robot [Mon, 26 Jun 2017 14:40:28 +0000 (14:40 +0000)]
Merge "Avoid use of TimeZoneDistro.equals() method"
Paul Duffin [Mon, 26 Jun 2017 14:35:01 +0000 (14:35 +0000)]
Merge "Remove a.t.TestCase"
am:
3c5ab7d324
Change-Id: Id2f80c8bb95e3e64207d937929e027c49e602a72
Paul Duffin [Mon, 26 Jun 2017 14:24:29 +0000 (14:24 +0000)]
Merge "Remove a.t.TestCase"
Chet Haase [Mon, 26 Jun 2017 13:44:57 +0000 (06:44 -0700)]
Fix TimePicker RTL issues
The TimePicker (seen when creating an alarm in the Clock app) has
two bugs in landscape mode:
- The hours/minutes switch places (hours should always be to the left
of minutes, regardless of RTL)
- The layout is completely messed up in 12-hour mode (the radial time picker
does not appear on the screen)
This fix addresses both issues by setting the layoutDirection="ltr"
attribute to force a couple of the layouts to be unaffected in RTL mode.
Specifically, the hours/minutes layout and the overall layout will always be
presented left-to-right.
Bug:
62846484 TimePicker layout is broken in RTL landscape mode
Test: manual (tested with/without fix in normal, forded-RTL mode, and
with Hebrew as the first locale).
Change-Id: I8ef3f2706660f60c162ba3d324a18b8f370f67f8
Paul Duffin [Mon, 26 Jun 2017 13:15:03 +0000 (13:15 +0000)]
Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
Hugo Benichi [Mon, 26 Jun 2017 12:07:12 +0000 (12:07 +0000)]
Merge "IpManager: always log immediate provisioning errors" am:
98f2decdad
am:
2d2f66d277
Change-Id: If1e885c13ce7ec1f480add63940bf9bc929d5072
Hugo Benichi [Mon, 26 Jun 2017 11:57:17 +0000 (11:57 +0000)]
Merge "IpManager: always log immediate provisioning errors"
am:
98f2decdad
Change-Id: I6d745a4d6e9b932c16fe54fdabe191962389882d
Hugo Benichi [Mon, 26 Jun 2017 11:43:11 +0000 (11:43 +0000)]
Merge "IpManager: always log immediate provisioning errors"
Paul Duffin [Mon, 26 Jun 2017 11:35:00 +0000 (11:35 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter" am:
1ed43cafb6
am:
4601ebf945
Change-Id: Icf7b8d1f5a3e0d18cd9a096a8171d6dab98b5992
Paul Duffin [Mon, 26 Jun 2017 11:27:36 +0000 (11:27 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
am:
1ed43cafb6
Change-Id: If185962713352c4ce4e0ff27bc333e5eededde7f
Paul Duffin [Mon, 26 Jun 2017 11:21:19 +0000 (11:21 +0000)]
Merge "Removed a.t.TestRunner and cleanup a.t.TestPrinter"
Neil Fuller [Thu, 22 Jun 2017 13:10:29 +0000 (14:10 +0100)]
Avoid use of TimeZoneDistro.equals() method
The TimeZoneDistro method is going away.
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual
Bug:
31008728
Change-Id: Id90cf7ce534b888bf6df1bf1dc9d497608dcdbe9
Adam Vartanian [Mon, 26 Jun 2017 10:08:23 +0000 (10:08 +0000)]
Merge "Add libcrypto to shared libraries of core/jni" into oc-dev-plus-aosp
Adam Vartanian [Mon, 26 Jun 2017 09:43:38 +0000 (10:43 +0100)]
Add libcrypto to shared libraries of core/jni
This was added to master in ag/
2447995 but not to aosp in aosp/420427,
which resulted in a failure in this branch.
Bug:
62991913
Test: make
Change-Id: Iefa0254c91e83da737a160f851c97ab3e6a7b0f8
Merged-In: I547bb838befa743d72d356c186ff3cd355736589
Paul Duffin [Mon, 26 Jun 2017 09:33:23 +0000 (09:33 +0000)]
Merge "Clean up TestCaseUtil" am:
43851d01d8
am:
e38d503394
Change-Id: I62a80b405d05ec7b4da050bd6b01df4c965d6187
Paul Duffin [Mon, 26 Jun 2017 09:24:39 +0000 (09:24 +0000)]
Merge "Clean up TestCaseUtil"
am:
43851d01d8
Change-Id: I5a56102b06053eb92583457105adf7e88bdb5502
Paul Duffin [Mon, 26 Jun 2017 09:15:05 +0000 (09:15 +0000)]
Merge "Clean up TestCaseUtil"
pkanwar [Wed, 31 May 2017 20:10:03 +0000 (13:10 -0700)]
Carrier Config changes to support IMSI encryption.
Adding 2 config parameters to CarrierConfigManager:
1. imsi_key_download_url.
2. imsi_key_expiration_days_time.
BUG:
35606429
Test: manual
Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2
Hugo Benichi [Thu, 22 Jun 2017 06:19:35 +0000 (15:19 +0900)]
IpManager: always log immediate provisioning errors
And also migrate remaining Log.e usage to logError.
Bug:
62716267
Test: built and flashed
Change-Id: I61a6cec081d2bc0fe3d73e46fd52f1a42684e58c
Hugo Benichi [Sat, 24 Jun 2017 12:37:45 +0000 (12:37 +0000)]
Merge "Relax SharedLogTest asserts" am:
91464bfe68
am:
541079e0d7
Change-Id: I7a584c155915196c9b6b1a856141a3d9ab5699db
Hugo Benichi [Sat, 24 Jun 2017 12:29:28 +0000 (12:29 +0000)]
Merge "Relax SharedLogTest asserts"
am:
91464bfe68
Change-Id: Ibcf2ee24ac33a23fb3813dc6045db154644e1a3d
Hugo Benichi [Sat, 24 Jun 2017 12:19:55 +0000 (12:19 +0000)]
Merge "Relax SharedLogTest asserts"
Daniel Sandler [Sat, 24 Jun 2017 02:02:17 +0000 (02:02 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
am:
7fce51594e
Change-Id: Ia84326f38bbd1154c9ee5a76c3952a9c5e0699f2
Daniel Sandler [Sat, 24 Jun 2017 01:50:34 +0000 (01:50 +0000)]
Merge "Remove unnecessary dumpsys output." into oc-dev
Wale Ogunwale [Sat, 24 Jun 2017 01:35:49 +0000 (01:35 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
am:
0b138595de
Change-Id: I9cb5f092e253f06fc2abe4c90c9070ecf472125f
TreeHugger Robot [Sat, 24 Jun 2017 01:21:39 +0000 (01:21 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
Selim Cinek [Sat, 24 Jun 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
am:
9bf5c0c3e1
Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10
Selim Cinek [Sat, 24 Jun 2017 00:44:08 +0000 (00:44 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
Hugo Benichi [Sat, 24 Jun 2017 00:40:48 +0000 (00:40 +0000)]
Merge changes I193297e0,I43beb966 am:
c729ff8253
am:
5dec1df23b -s ours
Change-Id: If036f9c7b4219a20ddb21d5aa1b7f3e3b29bee51
Selim Cinek [Sat, 24 Jun 2017 00:22:38 +0000 (17:22 -0700)]
Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.
Test: manual inspection
Fixes:
62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
Hugo Benichi [Sat, 24 Jun 2017 00:13:24 +0000 (00:13 +0000)]
Merge changes I193297e0,I43beb966
am:
c729ff8253
Change-Id: Ie35f8cfe6ab77d0547f38b3bdcaf8f57832c0354
Hugo Benichi [Sat, 24 Jun 2017 00:01:22 +0000 (00:01 +0000)]
Merge changes I193297e0,I43beb966
* changes:
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
Connectivity metrics: serialize networkId, transports, ifname
Bryce Lee [Fri, 23 Jun 2017 23:53:45 +0000 (23:53 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
am:
4b6219dab3
Change-Id: I01029ae8a05578e615683f326fe66df0b1e05bf8
Bryce Lee [Fri, 23 Jun 2017 23:45:15 +0000 (23:45 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
Bryce Lee [Fri, 23 Jun 2017 21:53:02 +0000 (14:53 -0700)]
Add ActivityInfo logging.
This changelist adds additional logging around the ActivityInfo used
during startActivity to trace down when the userid changes.
Bug:
38121026
Test: manual
Change-Id: I162f4772845bc2cae585b7e4b027f3cce33439f4
Wale Ogunwale [Fri, 23 Jun 2017 21:52:40 +0000 (14:52 -0700)]
Fixed some rotation while unlocking screen issue.
- Don't use snapshot that is in different orientation than the current
display orientation. This is a follow up to a previous CL whose
implementation wasn't complete.
- Disabled fixed for unnecessary relaunches when unlocking with
fingerprint sensor introduced in ag/
2310557. This causes regression in
the experience from N. We still have the relaunches, but we cover up the
delay by displaying the apps starting window.
- Added more trace log points.
Fixes:
62796190
Fixes:
62904487
Bug:
38494778
Test: go/wm-smoke and manual verification of bug.
Change-Id: Id161a334cb4455dd9eb25c6bb63d5bb3f8a6f1f0
susnata [Fri, 23 Jun 2017 22:43:03 +0000 (22:43 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
am:
c34dec82a9
Change-Id: Iec9bf203d787d5dcf585b8091bb32b20f1e09f37
TreeHugger Robot [Fri, 23 Jun 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
yinxu [Fri, 23 Jun 2017 22:27:42 +0000 (15:27 -0700)]
Fix the inconsistency of scan status.
In types.hal and ril.h, the scan status is defined as:
PARTIAL = 0x01
COMPLETE = 0x02
But in NetworkScanResult.java, the scan status is defined as:
public static final int SCAN_STATUS_PARTIAL = 0
public static final int SCAN_STATUS_COMPLETE = 1
This CL makes changes to NetworkScanResult.java so that the scan status
is consistent both in Telephony and RIL.
Test: Telephony sanity tests
Bug:
30954762
Change-Id: Iadcd344ad3fe682da98a1a41c2964583f67dc792
Elliott Hughes [Fri, 23 Jun 2017 21:26:41 +0000 (21:26 +0000)]
Merge "Replace MallocHelper with std::unique_ptr." am:
8330d5212d
am:
6dfb0ca3d5
Change-Id: Ib4853eeb3e5524935780881a1758262d50ab8e29
TreeHugger Robot [Fri, 23 Jun 2017 21:21:33 +0000 (21:21 +0000)]
Merge "resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp" into oc-dev-plus-aosp
Lucas Dupin [Fri, 23 Jun 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
am:
9b73401191
Change-Id: Iad0f7b3ff9db9128e825b72040cc4c9123dde4c1
Lucas Dupin [Fri, 23 Jun 2017 19:11:11 +0000 (19:11 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
Robert Sloan [Fri, 23 Jun 2017 19:09:47 +0000 (12:09 -0700)]
resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c6e9a52e67a06c16b6c8fb6f8eb4647b2fec508
Elliott Hughes [Fri, 23 Jun 2017 18:00:09 +0000 (18:00 +0000)]
Merge "Replace MallocHelper with std::unique_ptr."
am:
8330d5212d
Change-Id: I6ec7b1ddd823b48f3033546416e6ffc81d24c03a
Robert Sloan [Fri, 23 Jun 2017 17:53:23 +0000 (17:53 +0000)]
Merge "Don't statically link libcrypto in frameworks."
am:
a730fd2e64
Change-Id: I322c917f898d299db72272572453f968b4ec4beb
Elliott Hughes [Fri, 23 Jun 2017 17:51:45 +0000 (17:51 +0000)]
Merge "Replace MallocHelper with std::unique_ptr."
Treehugger Robot [Fri, 23 Jun 2017 17:42:38 +0000 (17:42 +0000)]
Merge "Don't statically link libcrypto in frameworks."
Siddharth Ray [Fri, 23 Jun 2017 17:19:45 +0000 (17:19 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
am:
2ffd98670f
Change-Id: I7f57683e774109f301e0763607853674c6fda9c9
TreeHugger Robot [Fri, 23 Jun 2017 17:12:22 +0000 (17:12 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
Dan Sandler [Fri, 23 Jun 2017 16:42:19 +0000 (12:42 -0400)]
Remove unnecessary dumpsys output.
Change-Id: I5ec0b6b44fca58e9f5f61444acbff7a15550b135
Fixes:
62828801
Test: adb shell dumpsys activity service SystemUI | grep -c tickerText
(should be zero)
Lucas Dupin [Fri, 23 Jun 2017 16:30:49 +0000 (09:30 -0700)]
Fix notification contrast with transparent bg
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
Change-Id: I2f0595408be61acb8267bb7449486ee46f7aad19
Fixes:
62937149
susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]
Fix for the missing focus in WebView form fields.
This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.
Bug:
62449959
Test: Manual
Change-Id: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2
Bill Yi [Fri, 23 Jun 2017 15:21:22 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: Ib2921d235716e858bddbbb2e3a9588b4133d9c84
TreeHugger Robot [Fri, 23 Jun 2017 15:11:46 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 23 Jun 2017 12:49:12 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I898195fead15228c4e4fa5617dacbddfc90dc6e2
TreeHugger Robot [Fri, 23 Jun 2017 12:42:32 +0000 (12:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Vladimir Marko [Fri, 23 Jun 2017 10:55:48 +0000 (10:55 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e
am:
1b4b326128
Change-Id: I165243924444f89ee880072c55eba012ccf1d149
Vladimir Marko [Fri, 23 Jun 2017 10:45:32 +0000 (10:45 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()."
am:
a634b38c8e
Change-Id: I5d80b7a76f1d9b3d7bfc152994551f0cd6defaba
Vladimir Marko [Fri, 23 Jun 2017 10:36:00 +0000 (10:36 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()."
Bill Yi [Fri, 23 Jun 2017 07:43:50 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib851156b7d64c1f1c3ea398dc1d80602219d2c0f
Auto-generated-cl: translation import
Robert Quattlebaum [Mon, 15 May 2017 22:53:29 +0000 (15:53 -0700)]
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.
Bug: b/
33073713
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689
(cherry pick from commit
557e0c38b98f66d6147206f23d24d8d73b09e3e5)
Change-Id: I21f9b41b8b31c63ceeb1bc9c965f6da2614c356a
Test: runtest frameworks-net (not in original commit message)
Hugo Benichi [Wed, 15 Mar 2017 14:05:01 +0000 (23:05 +0900)]
Connectivity metrics: serialize networkId, transports, ifname
This patch adds translation from ConnectivityMetricsEvent to
IpConnectivityEvent of recently added fields:
- top-level network id
- top-level ifname
- transports
Also adds inference of link layer from transports or ifname.
At the moment these new fields are not populated in
ConnectivityMetricsEvent. Follow-up patches will fill this gap for
the events of the android.net.metrics package.
Test: new unit tests, $ runtest frameworks-net passes
Bug:
34901696
Merged-In: I563a6a3183470bdfaabb7c781a1beaf6b1058bf0
(partial cherry pick from commit
73fd4d1fafd0208e843abb6a6ad8a46a6fb18143)
Change-Id: I6a00270e73a1bd07f23c367f2394d90a43ced47a
Test: runtest frameworks-net (not in original commit message)
Winson Chung [Fri, 23 Jun 2017 05:24:01 +0000 (05:24 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
am:
cd73cc4c6d
Change-Id: I380e262ab207e06b8a07b210d47cbc1294ba26f0
TreeHugger Robot [Fri, 23 Jun 2017 05:16:08 +0000 (05:16 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
Hugo Benichi [Fri, 23 Jun 2017 01:06:39 +0000 (10:06 +0900)]
Relax SharedLogTest asserts
This patch makes the asserts of SharedLogTest looser so that it is less
likely to get invalidated by a date formatting change.
The timestamp format of LocalLog changed in commit
6229d990828 from
"mm-dd HH:MM:SS.xxx" to "yyy-mm-ddTHH:MM:SS.xxx".
Bug:
62918393
Test: runtest frameworks-net pass
Change-Id: I57ab3e05a0f3093f9c7b1760e596a3919d4f2ed7
Roshan Pius [Fri, 23 Jun 2017 04:33:13 +0000 (04:33 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
am:
db11f55cb7
Change-Id: I9131d29ad8e192e7af7c596fb5d954e040adb968
TreeHugger Robot [Fri, 23 Jun 2017 04:26:45 +0000 (04:26 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
Seigo Nonaka [Fri, 23 Jun 2017 04:23:44 +0000 (04:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1
Change-Id: I5518dbd8b5d8a4548ea00bbfca0e3aee87880ee7
Daniel Nishi [Fri, 23 Jun 2017 04:19:10 +0000 (04:19 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
am:
f14c1e12cf
Change-Id: I48c0c952d4679304d1adcda238e93c6bdd133110
TreeHugger Robot [Fri, 23 Jun 2017 04:10:42 +0000 (04:10 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 04:09:32 +0000 (04:09 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
Bill Yi [Fri, 23 Jun 2017 03:47:22 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e7e2885713047eef21b2885aa82aec71a5f5aa8
Auto-generated-cl: translation import
Marie Janssen [Fri, 23 Jun 2017 03:38:17 +0000 (03:38 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse" am:
5a56873612
am:
3205ff1331
Change-Id: I0cd44ad8d22da154d0bf666b9075a3fcbc655439
Marie Janssen [Fri, 23 Jun 2017 03:28:34 +0000 (03:28 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse"
am:
5a56873612
Change-Id: Ie202361631f9268055a190c8606e07d89dc349d4
Marie Janssen [Fri, 23 Jun 2017 03:17:35 +0000 (03:17 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse"
Wale Ogunwale [Fri, 23 Jun 2017 02:19:26 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I5b73df5e46d26d2008dba7a34345a0c37c099514
TreeHugger Robot [Fri, 23 Jun 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
This CL contains Iac2a6fb3d82ef23d5ca6ee33f4aaa9ed28455271 by manual
merging to handle repository split.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
Daniel Nishi [Fri, 23 Jun 2017 01:53:03 +0000 (18:53 -0700)]
Add in the getCacheQuotaBytes method to wrapper.
Bug:
62623731
Test: Settings Unit Test
Change-Id: Ibd779c7d9e60c44440483489b231ba0715321bc1