OSDN Git Service
Adrian Roos [Wed, 9 Aug 2017 09:42:58 +0000 (09:42 +0000)]
Merge "FRP: Use verifyChallenge instead of verify" into oc-mr1-dev am:
fdd6089aef
am:
7a6ebe3d76
Change-Id: I9091c6e2028fcc347d8f9f9efdd7bdf39fccc1b4
Adrian Roos [Wed, 9 Aug 2017 09:32:19 +0000 (09:32 +0000)]
Merge "FRP: Use verifyChallenge instead of verify" into oc-mr1-dev
am:
fdd6089aef
Change-Id: I5ab8540c1cbf9bab803877903af14f4560001de6
TreeHugger Robot [Wed, 9 Aug 2017 09:19:15 +0000 (09:19 +0000)]
Merge "FRP: Use verifyChallenge instead of verify" into oc-mr1-dev
Sudheer Shanka [Wed, 9 Aug 2017 06:02:38 +0000 (06:02 +0000)]
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev am:
bd9884a331
am:
9107e37ca7
Change-Id: Iabf557628b76c788cce85a33ef4d7d84764e796a
Sudheer Shanka [Wed, 9 Aug 2017 05:51:02 +0000 (05:51 +0000)]
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev
am:
bd9884a331
Change-Id: I0ce73c459ff188dd3ace6480fa02d2e6aaab85f2
Sudheer Shanka [Wed, 9 Aug 2017 05:38:18 +0000 (05:38 +0000)]
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev
Kevin Chyn [Wed, 9 Aug 2017 05:10:12 +0000 (05:10 +0000)]
Merge "Fix fingerprint onEnumerationResult to use remaining instead of fid" into oc-mr1-dev am:
ea783a0905
am:
bbe9d9a40f
Change-Id: Ie88c9c52e9780660a4babf348059c9170a0ce0c7
Kevin Chyn [Wed, 9 Aug 2017 04:58:04 +0000 (04:58 +0000)]
Merge "Fix fingerprint onEnumerationResult to use remaining instead of fid" into oc-mr1-dev
am:
ea783a0905
Change-Id: I5748eadc6b2ce46a5c525db76ae9b449ae4dafa8
TreeHugger Robot [Wed, 9 Aug 2017 04:42:05 +0000 (04:42 +0000)]
Merge "Fix fingerprint onEnumerationResult to use remaining instead of fid" into oc-mr1-dev
Nate Fischer [Wed, 9 Aug 2017 03:12:24 +0000 (03:12 +0000)]
Merge "WebView: fix SafeBrowsingResponse javadocs" into oc-mr1-dev am:
a9fd746ec6
am:
f93765fc45
Change-Id: I2c507d1e0746125fa77627d9ea5808224f1c865d
Nate Fischer [Wed, 9 Aug 2017 03:01:59 +0000 (03:01 +0000)]
Merge "WebView: fix SafeBrowsingResponse javadocs" into oc-mr1-dev
am:
a9fd746ec6
Change-Id: I06f63b0866825a52da8dcd5d2492525e5c62a39f
Nate Fischer [Wed, 9 Aug 2017 02:52:53 +0000 (02:52 +0000)]
Merge "WebView: fix SafeBrowsingResponse javadocs" into oc-mr1-dev
Calin Juravle [Wed, 9 Aug 2017 02:10:22 +0000 (02:10 +0000)]
Merge "Add package use info to dexopt dump" into oc-mr1-dev am:
0c62487d4b
am:
811fdcaefe
Change-Id: Ib7a4f0fb643e27f426195fc8dc11387667e044ac
Makoto Onuki [Wed, 9 Aug 2017 01:51:41 +0000 (01:51 +0000)]
Merge "Intern process names." into oc-mr1-dev am:
a530d79209
am:
3debaa72d4
Change-Id: Iaa2fe2ca2d7680b99f170f2486b3018704e45432
Calin Juravle [Wed, 9 Aug 2017 01:47:46 +0000 (01:47 +0000)]
Merge "Add package use info to dexopt dump" into oc-mr1-dev
am:
0c62487d4b
Change-Id: Ie3d32c487a19a44e4a4bdf2d071b6ae297f25bae
Philip P. Moltmann [Wed, 9 Aug 2017 01:43:25 +0000 (01:43 +0000)]
Merge changes from topic 'ClosebySystem' into oc-mr1-dev am:
81021c77c8
am:
560d56500c
Change-Id: I171672bc56b845f87e602c84043ff90b59f25797
Philip P. Moltmann [Wed, 9 Aug 2017 01:41:51 +0000 (01:41 +0000)]
Prevent closing by prev owner after transfer. am:
3306c0d76b
am:
804563c1af
Change-Id: I41f1737c2db17b877fc6bbf7772d18ae708e44e0
Philip P. Moltmann [Wed, 9 Aug 2017 01:40:51 +0000 (01:40 +0000)]
Revert "Revert session-transfer change" am:
7460c5917b
am:
ccf0225c38
Change-Id: I30cc91c765e05e33f9b60005d29ad5f954a2fd23
Calin Juravle [Wed, 9 Aug 2017 01:35:23 +0000 (01:35 +0000)]
Merge "Add package use info to dexopt dump" into oc-mr1-dev
Makoto Onuki [Wed, 9 Aug 2017 01:31:03 +0000 (01:31 +0000)]
Merge "Intern process names." into oc-mr1-dev
am:
a530d79209
Change-Id: I84c2c6cec01add83511fef717960f79eb7a763b9
Kevin Chyn [Wed, 9 Aug 2017 01:27:38 +0000 (01:27 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev am:
d952a8b81a
am:
1aefc63ac5
Change-Id: I2e627486c4ed268aabb67aa7a1a892b18ffa21a4
Philip P. Moltmann [Wed, 9 Aug 2017 01:14:26 +0000 (01:14 +0000)]
Merge changes from topic 'ClosebySystem' into oc-mr1-dev
am:
81021c77c8
Change-Id: I74a060fb30453c34533fbe7bd240803c80bf63f5
Philip P. Moltmann [Wed, 9 Aug 2017 01:13:33 +0000 (01:13 +0000)]
Prevent closing by prev owner after transfer.
am:
3306c0d76b
Change-Id: I8c033bbfda3177467878b6a456a790237730634d
Philip P. Moltmann [Wed, 9 Aug 2017 01:11:49 +0000 (01:11 +0000)]
Revert "Revert session-transfer change"
am:
7460c5917b
Change-Id: I9f7927993fb3166cc6aeca751dd97aebc277a5db
TreeHugger Robot [Wed, 9 Aug 2017 01:10:03 +0000 (01:10 +0000)]
Merge "Intern process names." into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 01:01:11 +0000 (01:01 +0000)]
Merge changes from topic 'ClosebySystem' into oc-mr1-dev
* changes:
Allow to close session from wrong context.
Prevent closing by prev owner after transfer.
Revert "Revert session-transfer change"
TreeHugger Robot [Wed, 9 Aug 2017 00:50:05 +0000 (00:50 +0000)]
Merge "Remove misleading Location Accuracy comment"
Kevin Chyn [Wed, 9 Aug 2017 00:45:22 +0000 (00:45 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev
am:
d952a8b81a
Change-Id: I30c3a2c7a633e3e0201d966c4cc6f5d406a5c1a8
Todd Kennedy [Wed, 9 Aug 2017 00:29:17 +0000 (00:29 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev am:
6bf2990e28
am:
bc0e1e2766
Change-Id: Ie127f827fc1879dcb04f64810ff5c20446e4905a
TreeHugger Robot [Wed, 9 Aug 2017 00:22:01 +0000 (00:22 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev
Todd Kennedy [Tue, 8 Aug 2017 23:58:02 +0000 (23:58 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev
am:
6bf2990e28
Change-Id: Ia860bf5f5fc6b5851f076960e8228952f733e3ba
TreeHugger Robot [Tue, 8 Aug 2017 23:33:03 +0000 (23:33 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev
Calin Juravle [Tue, 8 Aug 2017 22:57:21 +0000 (22:57 +0000)]
Merge changes from topic 'info-per-split' into oc-mr1-dev am:
df421a8b47
am:
fe8ff8215f
Change-Id: I2ae4dd9455f34a10ddfdb368edd62f048b230d99
Sudheer Shanka [Tue, 8 Aug 2017 22:44:09 +0000 (15:44 -0700)]
Change logging format in KernelUidCpuFreqTimeReader.
TimeUtils.formatForLogging takes currentTimeMillis as
argument, not elapsedRealTime.
Bug:
63041570
Test: visual inspection of logs
Change-Id: I4b880f64a8ead9a6a4a37fa4b9691edfc38a12db
Fan Zhang [Tue, 8 Aug 2017 22:53:16 +0000 (22:53 +0000)]
Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev am:
6a820f2238
am:
774eace18c
Change-Id: Ib86300ac020de47871bb4c2c0557628ee9d8eeb8
Yohei Yukawa [Tue, 8 Aug 2017 22:45:14 +0000 (22:45 +0000)]
Merge changes I6de5ac05,I5f8c112d into oc-mr1-dev am:
8c009ebf4a
am:
f23a2f95d2
Change-Id: I74d11c6178449fa7463508c73f554e261d02ec03
Nate Fischer [Thu, 27 Jul 2017 19:33:55 +0000 (12:33 -0700)]
WebView: fix SafeBrowsingResponse javadocs
Docs change only.
This fixes javadoc errors in SafeBrowsingResponse.java:
* Typo: capital "B" in "onSafeBrowsingHit"
* Add full package names
* Add parameter lists to all linked methods
Bug:
64077668
Test: make update-api and check javadocs manually
Change-Id: I5e7b0e59ba865619b252f7e9e431ffac6e1bab1f
Calin Juravle [Tue, 8 Aug 2017 22:35:01 +0000 (22:35 +0000)]
Merge changes from topic 'info-per-split' into oc-mr1-dev
am:
df421a8b47
Change-Id: I76e4499cf3ca4506f59f6c80c0f20faeda90f3e6
Fan Zhang [Tue, 8 Aug 2017 22:27:49 +0000 (22:27 +0000)]
Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev
am:
6a820f2238
Change-Id: Iea7029ed562585c1529419bfeff79590534ffe50
Wyatt Riley [Tue, 8 Aug 2017 22:22:39 +0000 (15:22 -0700)]
Remove misleading Location Accuracy comment
Test: Treehugger to verify build (comment only)
Change-Id: Iea3c473219e21a58b01e613d14700d6972f5cce6
Yohei Yukawa [Tue, 8 Aug 2017 22:24:11 +0000 (22:24 +0000)]
Merge changes I6de5ac05,I5f8c112d into oc-mr1-dev
am:
8c009ebf4a
Change-Id: I4e2385729f8cfe475531d36bdc6b3f13914f022a
Calin Juravle [Mon, 7 Aug 2017 02:20:19 +0000 (19:20 -0700)]
Add package use info to dexopt dump
Bug:
64153885
Test: adb shell dumpsys package dexopt
Change-Id: I57768076de821980b1de84d5fe44ab642ceebeba
Calin Juravle [Tue, 8 Aug 2017 22:19:32 +0000 (22:19 +0000)]
Merge changes from topic 'info-per-split' into oc-mr1-dev
* changes:
Record usage information per split
Use PackageUseInfo in DexOptimizer
Adam Lesinski [Tue, 8 Aug 2017 22:18:55 +0000 (22:18 +0000)]
Merge "AAPT2: Fix windows unicode path issues"
TreeHugger Robot [Tue, 8 Aug 2017 22:13:11 +0000 (22:13 +0000)]
Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev
Makoto Onuki [Mon, 7 Aug 2017 16:58:23 +0000 (09:58 -0700)]
Intern process names.
Bug:
62144301
Test: Boot and start random apps on a secondary user
Change-Id: I8a9b475410c52e1063cff5519b0297ad69dd7925
Yohei Yukawa [Tue, 8 Aug 2017 21:54:13 +0000 (21:54 +0000)]
Merge changes I6de5ac05,I5f8c112d into oc-mr1-dev
* changes:
Fix system restart due to race in TSMS
Remove redundant synchonized blocks from TSMS
Robert Berry [Tue, 8 Aug 2017 21:43:36 +0000 (21:43 +0000)]
Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev am:
b152fb8d30
am:
dae011cc5a
Change-Id: I2940aafdf07b572ee69d988599a2f8084c290dab
Nate Fischer [Tue, 8 Aug 2017 21:38:54 +0000 (21:38 +0000)]
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev am:
2ddac82335
am:
650bae9c45
Change-Id: Ia4a5dc3fd03c2ecf9b7747d255380559e8955607
TreeHugger Robot [Tue, 8 Aug 2017 21:33:18 +0000 (21:33 +0000)]
Merge "Adding BatteryStatsUserLifecycleTests to BatteryStatsTests"
Robert Berry [Tue, 8 Aug 2017 21:31:30 +0000 (21:31 +0000)]
Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev
am:
b152fb8d30
Change-Id: I62fd850aa7c91e6fec27736e62d200ee82d27d54
TreeHugger Robot [Tue, 8 Aug 2017 21:19:41 +0000 (21:19 +0000)]
Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev
Nate Fischer [Tue, 8 Aug 2017 21:10:59 +0000 (21:10 +0000)]
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
am:
2ddac82335
Change-Id: I26963a3715fa0ea6222a5b68880456bdb1a6cdb0
Makoto Onuki [Tue, 8 Aug 2017 21:04:07 +0000 (21:04 +0000)]
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev am:
8ede87ded8
am:
2445841ec5
Change-Id: Ie0c40b825fe404c95619e1a51554418132638ad0
Nate Fischer [Tue, 8 Aug 2017 21:00:59 +0000 (21:00 +0000)]
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
Makoto Onuki [Tue, 8 Aug 2017 20:55:56 +0000 (20:55 +0000)]
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
am:
8ede87ded8
Change-Id: I3bfdd696cfd7abb1cb9ff04d93b7ebe3953280c9
Todd Kennedy [Tue, 1 Aug 2017 14:42:47 +0000 (07:42 -0700)]
Add virtual preload bit to ApplicationInfo
Change-Id: I2735b3823a8709b2ffb65cc8085ffcd952d3e1f2
Fixes:
64205417
Test: Manual
Test: Create a sample app and install it as a normal app
Test: See that it returns 'false' for "isVirtualPreload"
Test: Create a sample app and install it as a virtual preload ["--preload"]
Test: See that it returns 'true' for "isVirtualPreload"
Test: Run sample apps after reboot and see they return the correct value
TreeHugger Robot [Tue, 8 Aug 2017 20:40:32 +0000 (20:40 +0000)]
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
Pavel Grafov [Tue, 8 Aug 2017 20:35:42 +0000 (20:35 +0000)]
Merge "Mark profile password key as critical." into oc-mr1-dev am:
072b71f73f
am:
51ba8c7605
Change-Id: I415126156d87e37b450d1ee9994abb06e9259279
Yi Jin [Tue, 8 Aug 2017 20:32:15 +0000 (20:32 +0000)]
Merge "The proto field is set based on which header the data belongs to."
Pavel Grafov [Tue, 8 Aug 2017 20:21:24 +0000 (20:21 +0000)]
Merge "Mark profile password key as critical." into oc-mr1-dev
am:
072b71f73f
Change-Id: Id82d2c48b4463b9d0ec56e260e0f86a7d3b1f5e1
Philip P. Moltmann [Tue, 8 Aug 2017 17:44:34 +0000 (10:44 -0700)]
Allow to close session from wrong context.
commitLocked runs on a handler, thereby as system. It will call close()
if the package installer is popped-up to confirm the installation. Hence
we have to allow this use case without checking the caller.
Bug:
64467704
Test: gts-tradefed run singleCommand gts -m GtsPackageInstallSessionTestCases
Change-Id: I0bd0329c0485c50afa459d90c3372d7bf7408287
Philip P. Moltmann [Tue, 8 Aug 2017 16:19:23 +0000 (09:19 -0700)]
Prevent closing by prev owner after transfer.
Bug:
64467704
Test: gts-tradefed run singleCommand gts -m GtsPackageInstallSessionTestCases
Change-Id: I81fb1b641295cbb9e36504eb3e40f51ce6b2de94
Philip P. Moltmann [Tue, 8 Aug 2017 20:07:11 +0000 (20:07 +0000)]
Revert "Revert session-transfer change"
This reverts commit
9890f8b426550485aaab164a7bedbcd545862b85.
Bug:
64467704
Test: cts-tradefed run singleCommand cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionParamsUnitTest
cts-tradefed run singleCommand cts-dev -m CtsContentTestCases --test=android.content.pm.cts.InstallSessionTransferTest
Change-Id: I0cc7e1129d85e4d0de16ade44232a9bd381d6c04
Pavel Grafov [Tue, 8 Aug 2017 20:11:09 +0000 (20:11 +0000)]
Merge "Mark profile password key as critical." into oc-mr1-dev
Philip P. Moltmann [Tue, 8 Aug 2017 20:07:04 +0000 (20:07 +0000)]
Merge "Revert session-transfer change" into oc-mr1-dev am:
7bec053dff
am:
ddeb0a578a
Change-Id: I1dd82bedd35f297931608595da7f8b1e496e8285
Philip P. Moltmann [Tue, 8 Aug 2017 19:57:56 +0000 (19:57 +0000)]
Merge "Revert session-transfer change" into oc-mr1-dev
am:
7bec053dff
Change-Id: I0e9f40dccf423899b48ba8af9f2c266d6f32dc1f
Sundeep Ghuman [Tue, 8 Aug 2017 19:53:05 +0000 (19:53 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev am:
a5a660a84d
am:
9c628a7d7d
Change-Id: If982340d9d1bcc9eb903c743ebf83c77cbad4b40
Philip P. Moltmann [Tue, 8 Aug 2017 19:49:13 +0000 (19:49 +0000)]
Merge "Revert session-transfer change" into oc-mr1-dev
Android Build Merger (Role) [Tue, 8 Aug 2017 19:48:24 +0000 (19:48 +0000)]
Merge "Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev am:
23c0668a3f am:
a29fcfc5e4"
TreeHugger Robot [Tue, 8 Aug 2017 19:48:05 +0000 (19:48 +0000)]
Merge "Refactoring: Deprecate Paint.mNativeTypeface."
Sundeep Ghuman [Tue, 8 Aug 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
am:
a5a660a84d
Change-Id: Id3804ecaf51b18731d21dc8ff4f592bfcaa3095c
Wei Wang [Tue, 8 Aug 2017 19:47:06 +0000 (19:47 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev am:
23c0668a3f
am:
a29fcfc5e4
Change-Id: I91c3248c73acc3a53a639e003603cb9b2cb85fa6
jackqdyulei [Tue, 8 Aug 2017 19:42:54 +0000 (19:42 +0000)]
Merge "Update string for not charging." into oc-mr1-dev am:
ed0c5cf48f
am:
205afa7bd6
Change-Id: I5b669558511845402fbda458c748dce1c931733f
Wei Wang [Tue, 8 Aug 2017 19:38:00 +0000 (19:38 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
am:
23c0668a3f
Change-Id: Ib9ae218442f87cd3b09520e8c106b95ec2d2a947
TreeHugger Robot [Tue, 8 Aug 2017 19:35:36 +0000 (19:35 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
jackqdyulei [Tue, 8 Aug 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Update string for not charging." into oc-mr1-dev
am:
ed0c5cf48f
Change-Id: Ic91cca4e7babe179d13a82f850b634c98d55ff8c
Wei Wang [Tue, 8 Aug 2017 19:28:59 +0000 (19:28 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 19:27:29 +0000 (19:27 +0000)]
Merge "Update string for not charging." into oc-mr1-dev
Kevin Chyn [Tue, 8 Aug 2017 19:24:34 +0000 (12:24 -0700)]
Fix fingerprint onEnumerationResult to use remaining instead of fid
Fixes:
64087535
Test: make -j56, this code isn't used until we figure when to do
b/
63606218
Change-Id: I4c8804e71695ffc46e9b70c7f623e14e420f6242
Calin Juravle [Fri, 4 Aug 2017 08:42:17 +0000 (01:42 -0700)]
Record usage information per split
Increase the granularity of usage information to store data on each split
separately.
Now, splits get their own useByOtherApps flag and can be compiled
speed-profile when only the primary apk is loaded by other apps.
Bug:
64124380
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/*
Change-Id: Ibf9e7b9e67db9c6f0f45dc695bce8fbeb7be20ae
Calin Juravle [Fri, 4 Aug 2017 02:48:37 +0000 (19:48 -0700)]
Use PackageUseInfo in DexOptimizer
Pass the PackageUseInfo directly to DexOptimizer and use it to detect if a
package is used by other apps. Move the usage checks closer to dexopt so
that they can be easily adapted when we add usage info for each of the
app's code paths separately.
This is a refactoring CLs to reduce the size and complexity of the
upcoming CLs which record the usage info for each of the application
splits.
Bug:
64124380
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/*
Change-Id: I8031590cdaff81ab1792ca19baddb6cb36dc021d
Jakub Pawlowski [Tue, 8 Aug 2017 11:27:20 +0000 (04:27 -0700)]
Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.
Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
Kevin Chyn [Tue, 8 Aug 2017 18:58:58 +0000 (11:58 -0700)]
Update FINGERPRINT_ERROR_LOCKOUT documentation
Fixes:
64330785
Test: make -j56
Change-Id: I40f0e71b9fd7dcdd12340bc03bb077e56813f5b7
TreeHugger Robot [Tue, 8 Aug 2017 18:44:46 +0000 (18:44 +0000)]
Merge "Revert "Switch default renderer to Skia's OpenGL pipeline.""
Takashi Furukawa [Tue, 8 Aug 2017 18:36:55 +0000 (18:36 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev am:
552d35cb4f
am:
154a2377d5
Change-Id: I1c843a238cef6920887d8ed6a265913985452692
Takashi Furukawa [Tue, 8 Aug 2017 18:30:55 +0000 (18:30 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
am:
552d35cb4f
Change-Id: I04ea51eee6ad1030844a720132a3e67b007cb19f
Makoto Onuki [Tue, 8 Aug 2017 17:24:59 +0000 (10:24 -0700)]
Don't retain a bitmap unnecessarily
Due to a limitation in the GC, LazyTaskWriterThread would always retain
the last item it processed. Extract the second half into a separate
method to clarify the scope of the variable 'item' to the GC.
Bug:
64438652
Test: Launch several apps and check with ahat
Change-Id: Ie7357927ae61a8731285d14743187a2d811fbf8c
TreeHugger Robot [Tue, 8 Aug 2017 18:25:43 +0000 (18:25 +0000)]
Merge "Use 24 hour format for hours because we don't show am/pm"
TreeHugger Robot [Tue, 8 Aug 2017 18:23:52 +0000 (18:23 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
Seigo Nonaka [Tue, 1 Aug 2017 23:36:18 +0000 (16:36 -0700)]
Refactoring: Deprecate Paint.mNativeTypeface.
Bug:
64269689
Test: m checkbuild
Test: bit CtsGraphicsTestCases:*
Test: bit CtsViewTestCases:*
Test: bit CtsTextTestCases:*
Change-Id: Idc9f2b4612741be949204cd06efc41e1738d6587
Philip P. Moltmann [Tue, 8 Aug 2017 17:49:38 +0000 (10:49 -0700)]
Revert session-transfer change
This reverts:
5d74493f64493cd506d7458b810095259287f623
94deaf7725c418ec1950d810ab86f0d157ddf518
Bug:
64467704
Test: none, 100% revert
Change-Id: I6534c19c594dadfa41457725988485a67f0ed45f
TreeHugger Robot [Tue, 8 Aug 2017 17:53:05 +0000 (17:53 +0000)]
Merge changes from topics 'roozbeh-
b31537595-thirdtry', 'roozbeh-
b64372088'
* changes:
Make ellipsize retry if text doesn't fit
Reset StaticLayout.mEllipsized during generate()
Adam Lesinski [Tue, 8 Aug 2017 17:41:00 +0000 (17:41 +0000)]
Merge "AAPT2: Fix typo in Config parsing"
Siarhei Vishniakou [Tue, 8 Aug 2017 17:33:56 +0000 (17:33 +0000)]
Merge "Remove unused code that has a potential data race."
Fyodor Kupolov [Tue, 8 Aug 2017 17:03:42 +0000 (17:03 +0000)]
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev am:
3102245b62
am:
7aaf486267
Change-Id: I5bddc3a272a637c8c5a158a7d871087929075213
Derek Sollenberger [Tue, 8 Aug 2017 16:45:05 +0000 (16:45 +0000)]
Revert "Switch default renderer to Skia's OpenGL pipeline."
This reverts commit
312a3a0c28c8e899ff60883fa388c3919ea3b72b.
Fixes:
64478761
Change-Id: I8caf95ead1b339447768b5e360a6d0b9705477de
Fyodor Kupolov [Tue, 8 Aug 2017 16:55:10 +0000 (16:55 +0000)]
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
am:
3102245b62
Change-Id: I0997e70779456c1181d7750c1daa539afbc8dc0e
Adrian Roos [Tue, 8 Aug 2017 16:32:03 +0000 (18:32 +0200)]
FRP: Use verifyChallenge instead of verify
Otherwise the gatekeeper payload is null, which we treat as an error.
Change-Id: I56035195fe249df15f6fe699718f41b69de5ba37
Fixes:
64478778
Test: Try to use FRP credential; verify it works.
Fyodor Kupolov [Tue, 8 Aug 2017 16:46:24 +0000 (16:46 +0000)]
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev