Robert Berry
bfcff7be30
Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev am: b152fb8d30
...
am: dae011cc5a
2017-08-08 21:43:36 +00:00
Nate Fischer
0c8eab49c8
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev am: 2ddac82335
...
am: 650bae9c45
2017-08-08 21:38:54 +00:00
TreeHugger Robot
20e6c27a46
Merge "Adding BatteryStatsUserLifecycleTests to BatteryStatsTests"
2017-08-08 21:33:18 +00:00
Robert Berry
dae011cc5a
Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev
...
am: b152fb8d30
2017-08-08 21:31:30 +00:00
TreeHugger Robot
b152fb8d30
Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev
2017-08-08 21:19:41 +00:00
Nate Fischer
650bae9c45
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
...
am: 2ddac82335
2017-08-08 21:10:59 +00:00
Makoto Onuki
eacba0a7ba
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev am: 8ede87ded8
...
am: 2445841ec5
2017-08-08 21:04:07 +00:00
Nate Fischer
2ddac82335
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
2017-08-08 21:00:59 +00:00
Makoto Onuki
2445841ec5
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
...
am: 8ede87ded8
2017-08-08 20:55:56 +00:00
TreeHugger Robot
8ede87ded8
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
2017-08-08 20:40:32 +00:00
Pavel Grafov
d72acb3bd4
Merge "Mark profile password key as critical." into oc-mr1-dev am: 072b71f73f
...
am: 51ba8c7605
2017-08-08 20:35:42 +00:00
Yi Jin
06525c209e
Merge "The proto field is set based on which header the data belongs to."
2017-08-08 20:32:15 +00:00
Pavel Grafov
51ba8c7605
Merge "Mark profile password key as critical." into oc-mr1-dev
...
am: 072b71f73f
2017-08-08 20:21:24 +00:00
Pavel Grafov
072b71f73f
Merge "Mark profile password key as critical." into oc-mr1-dev
2017-08-08 20:11:09 +00:00
Philip P. Moltmann
3cb46e1a86
Merge "Revert session-transfer change" into oc-mr1-dev am: 7bec053dff
...
am: ddeb0a578a
2017-08-08 20:07:04 +00:00
Philip P. Moltmann
ddeb0a578a
Merge "Revert session-transfer change" into oc-mr1-dev
...
am: 7bec053dff
2017-08-08 19:57:56 +00:00
Sundeep Ghuman
ff09600616
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev am: a5a660a84d
...
am: 9c628a7d7d
2017-08-08 19:53:05 +00:00
Philip P. Moltmann
7bec053dff
Merge "Revert session-transfer change" into oc-mr1-dev
2017-08-08 19:49:13 +00:00
Android Build Merger (Role)
5f43ed9036
Merge "Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev am: 23c0668a3f am: a29fcfc5e4"
2017-08-08 19:48:24 +00:00
TreeHugger Robot
891f481ef8
Merge "Refactoring: Deprecate Paint.mNativeTypeface."
2017-08-08 19:48:05 +00:00
Sundeep Ghuman
9c628a7d7d
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
...
am: a5a660a84d
2017-08-08 19:47:52 +00:00
Wei Wang
2e847f2d0e
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev am: 23c0668a3f
...
am: a29fcfc5e4
2017-08-08 19:47:06 +00:00
jackqdyulei
e685cc06a8
Merge "Update string for not charging." into oc-mr1-dev am: ed0c5cf48f
...
am: 205afa7bd6
2017-08-08 19:42:54 +00:00
Wei Wang
a29fcfc5e4
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
...
am: 23c0668a3f
2017-08-08 19:38:00 +00:00
TreeHugger Robot
a5a660a84d
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
2017-08-08 19:35:36 +00:00
jackqdyulei
205afa7bd6
Merge "Update string for not charging." into oc-mr1-dev
...
am: ed0c5cf48f
2017-08-08 19:35:24 +00:00
Wei Wang
23c0668a3f
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
2017-08-08 19:28:59 +00:00
TreeHugger Robot
ed0c5cf48f
Merge "Update string for not charging." into oc-mr1-dev
2017-08-08 19:27:29 +00:00
Jakub Pawlowski
06ae9c665b
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
2017-08-08 19:04:13 +00:00
TreeHugger Robot
544918b30f
Merge "Revert "Switch default renderer to Skia's OpenGL pipeline.""
2017-08-08 18:44:46 +00:00
Takashi Furukawa
1be845460b
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev am: 552d35cb4f
...
am: 154a2377d5
2017-08-08 18:36:55 +00:00
Takashi Furukawa
154a2377d5
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
...
am: 552d35cb4f
2017-08-08 18:30:55 +00:00
Makoto Onuki
62a93aada1
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
2017-08-08 18:29:53 +00:00
TreeHugger Robot
0ebe6e31ba
Merge "Use 24 hour format for hours because we don't show am/pm"
2017-08-08 18:25:43 +00:00
TreeHugger Robot
552d35cb4f
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
2017-08-08 18:23:52 +00:00
Seigo Nonaka
318ca04079
Refactoring: Deprecate Paint.mNativeTypeface.
...
Bug: 64269689
Test: m checkbuild
Test: bit CtsGraphicsTestCases:*
Test: bit CtsViewTestCases:*
Test: bit CtsTextTestCases:*
Change-Id: Idc9f2b4612741be949204cd06efc41e1738d6587
2017-08-08 18:07:28 +00:00
Philip P. Moltmann
9890f8b426
Revert session-transfer change
...
This reverts:
5d74493f6494deaf7725
2017-08-08 11:04:56 -07:00
TreeHugger Robot
a7d731d5fe
Merge changes from topics 'roozbeh-b31537595-thirdtry', 'roozbeh-b64372088'
...
* changes:
Make ellipsize retry if text doesn't fit
Reset StaticLayout.mEllipsized during generate()
2017-08-08 17:53:05 +00:00
Adam Lesinski
e2ba325d27
Merge "AAPT2: Fix typo in Config parsing"
2017-08-08 17:41:00 +00:00
Siarhei Vishniakou
bf567be4e0
Merge "Remove unused code that has a potential data race."
2017-08-08 17:33:56 +00:00
Fyodor Kupolov
88f14dd257
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev am: 3102245b62
...
am: 7aaf486267
2017-08-08 17:03:42 +00:00
Derek Sollenberger
27e9329d04
Revert "Switch default renderer to Skia's OpenGL pipeline."
...
This reverts commit 312a3a0c28
2017-08-08 16:56:26 +00:00
Fyodor Kupolov
7aaf486267
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
...
am: 3102245b62
2017-08-08 16:55:10 +00:00
Fyodor Kupolov
3102245b62
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
2017-08-08 16:46:24 +00:00
Todd Kennedy
beb284bcf8
Merge "Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am: bb6653c404 am: eebd877904" into oc-mr1-dev-plus-aosp
...
am: 94e946b0b4
2017-08-08 16:36:23 +00:00
Todd Kennedy
001229225e
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am: bb6653c404 am: 1f3c3376e6
...
am: cbb2475d4a
2017-08-08 16:33:52 +00:00
Hugo Benichi
23e9a62dd0
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e33" into oc-mr1-dev am: 279c26fa24
...
am: 3bbf3f60e9
2017-08-08 16:32:01 +00:00
Sundeep Ghuman
d1e449267a
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
2017-08-08 09:30:22 -07:00
Hugo Benichi
97af984806
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am: 5e24152e33 am: 43581b8759" into oc-mr1-dev-plus-aosp
...
am: 6af25a5ef6
2017-08-08 16:30:16 +00:00
Android Build Merger (Role)
94e946b0b4
Merge "Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am: bb6653c404 am: eebd877904" into oc-mr1-dev-plus-aosp
2017-08-08 16:25:52 +00:00
