OSDN Git Service
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
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
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
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 [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
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
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
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
Fyodor Kupolov [Tue, 8 Aug 2017 16:46:24 +0000 (16:46 +0000)]
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
Todd Kennedy [Tue, 8 Aug 2017 16:36:23 +0000 (16:36 +0000)]
Merge "Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404 am:
eebd877904" into oc-mr1-dev-plus-aosp
am:
94e946b0b4
Change-Id: Icb893ae106d6dd70b4c493d2c0a727069ff857e0
Todd Kennedy [Tue, 8 Aug 2017 16:33:52 +0000 (16:33 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404 am:
1f3c3376e6
am:
cbb2475d4a
Change-Id: I095e7cbac2aa1011279e065c8783b1dd93ac2af8
Hugo Benichi [Tue, 8 Aug 2017 16:32:01 +0000 (16:32 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33" into oc-mr1-dev am:
279c26fa24
am:
3bbf3f60e9
Change-Id: I0cdde164d0ab5f25c29abb2e739975cce1047dbd
Sundeep Ghuman [Mon, 7 Aug 2017 18:21:38 +0000 (11:21 -0700)]
Refactor WifiTracker sStaleScanResults.
In ag/
2580164, in order to minimize changes, we used mutable static
state in WifiTracker to control cache eviction. This breaks a certain
flow in SetupWizard. This change reverts sStaleScanResults to an
instance member and then pipes the value into the AccessPoint update
call to control cache eviction instead of relying on error prone use of
mutable static state.
Bug:
63479352
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
&&
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Manual: See bug
Change-Id: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
Hugo Benichi [Tue, 8 Aug 2017 16:30:16 +0000 (16:30 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33 am:
43581b8759" into oc-mr1-dev-plus-aosp
am:
6af25a5ef6
Change-Id: Ib488fb034f72c92f19916490981342a3ef2eb33b
Android Build Merger (Role) [Tue, 8 Aug 2017 16:25:52 +0000 (16:25 +0000)]
Merge "Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404 am:
eebd877904" into oc-mr1-dev-plus-aosp
Todd Kennedy [Tue, 8 Aug 2017 16:24:34 +0000 (16:24 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404
am:
eebd877904
Change-Id: If2743b679e9ba52e680f79349656629facb9cd0a
Todd Kennedy [Tue, 8 Aug 2017 16:23:09 +0000 (16:23 +0000)]
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev am:
8c18e1faf8
am:
3ff3e75fb2
Change-Id: I21a656cd60896a73dd0ca07b47f09af92f874dff
Todd Kennedy [Tue, 8 Aug 2017 16:22:15 +0000 (16:22 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404
am:
1f3c3376e6
Change-Id: Ie15dabd5cf3f53b447565a5a6472c32a7f645588
TreeHugger Robot [Tue, 8 Aug 2017 16:19:42 +0000 (16:19 +0000)]
Merge "Revert "Enable focus logs for WindowManagerService.""
Todd Kennedy [Tue, 8 Aug 2017 16:16:06 +0000 (16:16 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
am:
bb6653c404
Change-Id: I4e0dbda0e13e5419abfa25e2719d8fdcea0fa047
Hugo Benichi [Tue, 8 Aug 2017 16:16:06 +0000 (16:16 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33" into oc-mr1-dev
am:
279c26fa24
Change-Id: Id85a409a2d3cc12e53f977f94f7b5a306115a09a
Todd Kennedy [Tue, 8 Aug 2017 16:16:05 +0000 (16:16 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
am:
bb6653c404
Change-Id: I7224af4db28368292609a6c7728bcfd9a299b784
Android Build Merger (Role) [Tue, 8 Aug 2017 16:12:29 +0000 (16:12 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33 am:
43581b8759" into oc-mr1-dev-plus-aosp
Pavel Grafov [Tue, 8 Aug 2017 15:53:32 +0000 (16:53 +0100)]
Mark profile password key as critical.
Currently it is erased when keystore for user 0 is cleared, e.g.
when the user clears data for Settings app.
Bug:
64467610
Bug:
35929605
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
Hugo Benichi [Tue, 8 Aug 2017 16:10:52 +0000 (16:10 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33
am:
43581b8759
Change-Id: I67d5dc4b52b254748ff17fe1e16c2eeb1d03c30d
TreeHugger Robot [Tue, 8 Aug 2017 16:08:48 +0000 (16:08 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
Todd Kennedy [Tue, 8 Aug 2017 16:06:17 +0000 (16:06 +0000)]
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
am:
8c18e1faf8
Change-Id: If0d1dc60455c961215454a5b2edcb59c0097add4
Android Build Merger (Role) [Tue, 8 Aug 2017 16:03:17 +0000 (16:03 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33" into oc-mr1-dev
Hugo Benichi [Tue, 8 Aug 2017 16:01:10 +0000 (16:01 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
am:
5e24152e33
Change-Id: Id6040a899653c585d298b7be7208f5cba997f665
Hugo Benichi [Tue, 8 Aug 2017 16:01:07 +0000 (16:01 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
am:
5e24152e33
Change-Id: I2ac0bc3914cb65ae8ee27921856d698dc59624b2
TreeHugger Robot [Tue, 8 Aug 2017 15:58:41 +0000 (15:58 +0000)]
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 15:52:39 +0000 (15:52 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
Todd Lee [Tue, 8 Aug 2017 15:42:36 +0000 (15:42 +0000)]
Merge "Device Default theming updates for Wear" into oc-mr1-dev am:
faa01fb370
am:
b208d5c4f3
Change-Id: I499d6ea45e3275662d7485ce25c0db4cfd898f19
Todd Lee [Tue, 8 Aug 2017 15:36:05 +0000 (15:36 +0000)]
Merge "Device Default theming updates for Wear" into oc-mr1-dev
am:
faa01fb370
Change-Id: Iac1d92b1bd1571ef5f9ee93db7732ac947845d98
Todd Lee [Tue, 8 Aug 2017 15:31:30 +0000 (15:31 +0000)]
Merge "Device Default theming updates for Wear" into oc-mr1-dev
Bryce Lee [Tue, 8 Aug 2017 14:36:51 +0000 (07:36 -0700)]
Revert "Enable focus logs for WindowManagerService."
Removing temporary log enabling.
Bug:
63404575
Test: manual
This reverts commit
272d14c56f805539cba76c123b5b88eee11b9b34.
Change-Id: I72f1a4b98a4a896b392a5fdc6b1fd07fb252f34d
Kirill Grouchnikov [Tue, 8 Aug 2017 13:50:35 +0000 (13:50 +0000)]
Merge "Tweak test app makefile with extra resources"
Kenny Guy [Tue, 8 Aug 2017 13:15:49 +0000 (13:15 +0000)]
Merge "Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5 am:
ede09428f6 -s ours" into oc-mr1-dev-plus-aosp
am:
ef2f0a36ea -s ours
Change-Id: I4c1ff22f533bb1e2e49171a37119b8df5242295d
Kenny Guy [Tue, 8 Aug 2017 13:13:37 +0000 (13:13 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5 -s ours am:
c209e50d67 -s ours
am:
e0a40bebd3 -s ours
Change-Id: I594f83dc71042ef30fee3ef74ab1de029702f29e
Android Build Merger (Role) [Tue, 8 Aug 2017 13:06:37 +0000 (13:06 +0000)]
Merge "Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5 am:
ede09428f6 -s ours" into oc-mr1-dev-plus-aosp
Kenny Guy [Tue, 8 Aug 2017 13:04:09 +0000 (13:04 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5
am:
ede09428f6 -s ours
Change-Id: If05e756f102dc74cc3f46a03eed0fc53f954f15c
Kenny Guy [Tue, 8 Aug 2017 13:03:57 +0000 (13:03 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5 -s ours
am:
c209e50d67 -s ours
Change-Id: I0f97b893f1c421b29cd95c60f91dcda4d4e95e7d
Kenny Guy [Tue, 8 Aug 2017 12:58:32 +0000 (12:58 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
am:
91866c65a5
Change-Id: Ia29014e839bfcf345e8efa56d8ec2906f80b1e38
OSDN Git Service
