OSDN Git Service
Garfield Tan [Wed, 11 Jan 2017 00:56:21 +0000 (00:56 +0000)]
Merge "Check visible paths as well when generate docId from file system path."
Hugo Benichi [Wed, 11 Jan 2017 00:49:57 +0000 (00:49 +0000)]
Merge "ipconnectivity.proto: change Transport to LinkLayer"
Android Build Merger (Role) [Wed, 11 Jan 2017 00:17:51 +0000 (00:17 +0000)]
Merge "Merge "Fix naming of key" am:
0b74a1dabb am:
c68c2f6885 am:
1d67d022fb am:
11765b3fcc -s ours"
Jordan Liu [Wed, 11 Jan 2017 00:16:43 +0000 (00:16 +0000)]
Merge "Fix naming of key" am:
0b74a1dabb am:
c68c2f6885 am:
1d67d022fb
am:
11765b3fcc -s ours
Change-Id: Ica15c50f4cc0ec0905cf0f573bdcf0c3b032da68
Android Build Merger (Role) [Wed, 11 Jan 2017 00:16:06 +0000 (00:16 +0000)]
Merge changes from topic 'am-
7c32574535fe4d59a550a86c30095868'
* changes:
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am:
98d86fe2b7 am:
c6d9f0fbce am:
367f70cca4 am:
6c852fb228
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am:
54e387ddbe am:
839a185b2e am:
df781cc514 am:
15fe73846c
Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am:
8225b7c951 am:
63a7fe6de8 am:
024793713f am:
4a27be1952 -s ours
Zygote: Additional whitelisting for legacy devices. am:
f701ba36b3 am:
7a69406767 am:
647986fd54 am:
e34b213b30
Robert Sesek [Wed, 11 Jan 2017 00:14:22 +0000 (00:14 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am:
98d86fe2b7 am:
c6d9f0fbce am:
367f70cca4
am:
6c852fb228
Change-Id: Icb9cec440489f782092a1b7fbf1801bb6b8a03db
Robert Sesek [Wed, 11 Jan 2017 00:13:10 +0000 (00:13 +0000)]
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am:
54e387ddbe am:
839a185b2e am:
df781cc514
am:
15fe73846c
Change-Id: If94ee0ece8b08f748ac10aa9a0d64c5ec67e6059
Robert Sesek [Wed, 11 Jan 2017 00:11:47 +0000 (00:11 +0000)]
Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am:
8225b7c951 am:
63a7fe6de8 am:
024793713f
am:
4a27be1952 -s ours
Change-Id: I2cd395598bcd4fb5c995f03eb22f62469c597450
TreeHugger Robot [Wed, 11 Jan 2017 00:11:25 +0000 (00:11 +0000)]
Merge "Move getActiveScorerPackage() to the score service."
Narayan Kamath [Wed, 11 Jan 2017 00:10:44 +0000 (00:10 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
f701ba36b3 am:
7a69406767 am:
647986fd54
am:
e34b213b30
Change-Id: I351a6e43b1ef28e91d9bb9632f13641c2711277a
Jordan Liu [Tue, 10 Jan 2017 23:55:55 +0000 (23:55 +0000)]
Merge "Fix naming of key" am:
0b74a1dabb am:
c68c2f6885
am:
1d67d022fb
Change-Id: I6165395ac186baac90c2d08d7c7114c7b5bc72d3
Robert Sesek [Tue, 10 Jan 2017 23:53:40 +0000 (23:53 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am:
98d86fe2b7 am:
c6d9f0fbce
am:
367f70cca4
Change-Id: I039178a775f15d9a6e82ab481d15896e243759e9
Robert Sesek [Tue, 10 Jan 2017 23:52:13 +0000 (23:52 +0000)]
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am:
54e387ddbe am:
839a185b2e
am:
df781cc514
Change-Id: I869aaa330de7fb0de2d608a6cbf7a8974e9757ba
Andreas Gampe [Tue, 10 Jan 2017 23:51:35 +0000 (23:51 +0000)]
Merge "resolve merge conflicts of
53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am:
ba33854fbc
am:
75bcb01466
Change-Id: I62a5c933c49bc7d3c1ee996b09b0255b1fc25d19
Robert Sesek [Tue, 10 Jan 2017 23:51:14 +0000 (23:51 +0000)]
Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am:
8225b7c951 am:
63a7fe6de8
am:
024793713f
Change-Id: If30588787332fbfcdf4573f976ec8ca086db8260
Andreas Gampe [Tue, 10 Jan 2017 23:50:28 +0000 (23:50 +0000)]
resolve merge conflicts of
53726c0bbfaf to nyc-mr1-dev-plus-aosp am:
be3a8ad2ba
am:
fb52b3700c
Change-Id: I7df690c4511898936c5a2b397034c108c29ebef2
Narayan Kamath [Tue, 10 Jan 2017 23:50:23 +0000 (23:50 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
f701ba36b3 am:
7a69406767
am:
647986fd54
Change-Id: I1c508f812298bc9ec6870a3e655129e630e536e5
Jordan Liu [Tue, 10 Jan 2017 23:44:43 +0000 (23:44 +0000)]
Merge "Fix naming of key" am:
0b74a1dabb
am:
c68c2f6885
Change-Id: Ibdd5177ea43ee9c2ea5603363429a7207a59d5ba
Andreas Gampe [Tue, 10 Jan 2017 23:42:19 +0000 (23:42 +0000)]
Merge "resolve merge conflicts of
53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am:
ba33854fbc
Change-Id: I109dedc6bec6847b81a2a88b698938910a2715bf
Andreas Gampe [Tue, 10 Jan 2017 23:42:12 +0000 (23:42 +0000)]
resolve merge conflicts of
53726c0bbfaf to nyc-mr1-dev-plus-aosp
am:
be3a8ad2ba
Change-Id: I76970ff769a4cad2b3d702f0282515fb58defcbb
Robert Sesek [Tue, 10 Jan 2017 23:41:13 +0000 (23:41 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc am:
98d86fe2b7
am:
c6d9f0fbce
Change-Id: I0010cbf45a5e9fc10f86dbfbda510d34ba4b7429
Robert Sesek [Tue, 10 Jan 2017 23:40:15 +0000 (23:40 +0000)]
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am:
54e387ddbe
am:
839a185b2e
Change-Id: I1e761ea737447b347f2542419d18d1f42b1b50db
Robert Sesek [Tue, 10 Jan 2017 23:39:28 +0000 (23:39 +0000)]
Split core/jni/fd_utils-inl.h into a .h/.cpp pair. am:
8225b7c951
am:
63a7fe6de8
Change-Id: I9148523bae8466e56cf00d7624c53c22318215f7
Narayan Kamath [Tue, 10 Jan 2017 23:38:18 +0000 (23:38 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
f701ba36b3
am:
7a69406767
Change-Id: I932aa16137686cce2be00a13f32978df34857709
Makoto Onuki [Tue, 10 Jan 2017 23:37:14 +0000 (23:37 +0000)]
Merge "Allow adding target activity via requestPinShortcut()."
Andreas Gampe [Tue, 10 Jan 2017 23:34:41 +0000 (23:34 +0000)]
Merge "resolve merge conflicts of
53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Tue, 10 Jan 2017 23:12:18 +0000 (15:12 -0800)]
resolve merge conflicts of
53726c0bbfaf to nyc-mr1-dev-plus-aosp
Change-Id: Iddf65660f9ac1d66907c8a3d2a3d34d9f3f66d81
Jordan Liu [Tue, 10 Jan 2017 22:59:18 +0000 (22:59 +0000)]
Merge "Fix naming of key"
am:
0b74a1dabb
Change-Id: I8eaaee259d96c2c2da70828cd882a86ae6bde8f1
TreeHugger Robot [Tue, 10 Jan 2017 22:55:57 +0000 (22:55 +0000)]
Merge "add dark assets to sw900dp devices."
Jeremy Joslin [Tue, 10 Jan 2017 22:54:24 +0000 (22:54 +0000)]
Merge "Cleanup test method names." am:
8e9fd295c8 am:
361412ced4 am:
f41881b7fe
am:
24d5a0bae2 -s ours
Change-Id: I663efcf7cb1367be5d17b417d8c7b35012cf1ce6
Jordan Liu [Tue, 10 Jan 2017 22:51:49 +0000 (22:51 +0000)]
Merge "Fix naming of key"
Jeremy Joslin [Tue, 10 Jan 2017 22:48:47 +0000 (22:48 +0000)]
Merge "Cleanup test method names." am:
8e9fd295c8 am:
361412ced4
am:
f41881b7fe
Change-Id: I779562d42a399beaa8df47050d68a6fc95f47fba
Jeremy Joslin [Tue, 10 Jan 2017 22:39:23 +0000 (22:39 +0000)]
Merge "Cleanup test method names." am:
8e9fd295c8
am:
361412ced4
Change-Id: I160b077d4faff67a721e9557f7dae10682dc2d81
Robert Sesek [Tue, 10 Jan 2017 22:33:04 +0000 (22:33 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc
am:
98d86fe2b7
Change-Id: If98bcf93212e84c0e01eb3281b729e1760762356
Robert Sesek [Tue, 10 Jan 2017 22:33:00 +0000 (22:33 +0000)]
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
am:
54e387ddbe
Change-Id: I7b4e809767e4cdd64da4094decc929504e1e93d8
Robert Sesek [Tue, 10 Jan 2017 22:32:05 +0000 (22:32 +0000)]
Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
am:
8225b7c951
Change-Id: Ic5a021e5851f158caddc7f58ad7098a070f6219a
Narayan Kamath [Tue, 10 Jan 2017 22:30:41 +0000 (22:30 +0000)]
Zygote: Additional whitelisting for legacy devices.
am:
f701ba36b3
Change-Id: Ic12fdc0261f258dcd1019290a057fef4fcedd0f3
Narayan Kamath [Tue, 10 Jan 2017 22:29:55 +0000 (22:29 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
0ff7ef60f5
Change-Id: Ia4ee03a2a8e801918306cacf5ff1f69401f3847d
Jeremy Joslin [Tue, 10 Jan 2017 22:28:51 +0000 (22:28 +0000)]
Merge "Cleanup test method names."
am:
8e9fd295c8
Change-Id: Idb000e2b6cd8b7ba2046d329e039f6b05424686e
Treehugger Robot [Tue, 10 Jan 2017 22:21:01 +0000 (22:21 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc
* changes:
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
Zygote: Additional whitelisting for legacy devices.
Zygote: Additional whitelists for runtime overlay / other static resources.
Treehugger Robot [Tue, 10 Jan 2017 22:18:56 +0000 (22:18 +0000)]
Merge "Cleanup test method names."
TreeHugger Robot [Tue, 10 Jan 2017 22:16:15 +0000 (22:16 +0000)]
Merge "Provide non-blocking SurfaceView draw notification path."
Makoto Onuki [Tue, 10 Jan 2017 19:47:25 +0000 (11:47 -0800)]
Allow adding target activity via requestPinShortcut().
Also now ShortcutManager tries to fill in the main activity as the target
activity if the caller has one.
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: Running: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsShortcutHostTestCases
Bug
34047091
Change-Id: I2bf2b20e94a2384cfa6e6b7d40d56cfe96a94fd9
Michael Dooley [Tue, 10 Jan 2017 22:02:12 +0000 (22:02 +0000)]
Merge "Adding extra key to indicate when the last emergency call was made."
Tao Wu [Tue, 10 Jan 2017 21:44:25 +0000 (21:44 +0000)]
Merge "Remove unused variable." am:
f3b1881bb2 am:
f338ed34f9 am:
cab27fbbf4
am:
a3c801bac4 -s ours
Change-Id: I1f1a9817e73c4f1fa59605a5484a2a08017b008d
Tao Wu [Tue, 10 Jan 2017 21:39:19 +0000 (21:39 +0000)]
Merge "Remove unused variable." am:
f3b1881bb2 am:
f338ed34f9
am:
cab27fbbf4
Change-Id: I454d6359029bdbffa5e124e31759f30d6aec5f76
Tao Wu [Tue, 10 Jan 2017 21:34:20 +0000 (21:34 +0000)]
Merge "Remove unused variable." am:
f3b1881bb2
am:
f338ed34f9
Change-Id: Ia2ab8632bfe5e5b4751bb89aad30c3c739112469
Tao Wu [Tue, 10 Jan 2017 21:29:16 +0000 (21:29 +0000)]
Merge "Remove unused variable."
am:
f3b1881bb2
Change-Id: I563647e4f5abc635ff3f67d7f0b658bdd1d92716
TreeHugger Robot [Tue, 10 Jan 2017 21:15:18 +0000 (21:15 +0000)]
Merge "Moved isCallerActiveScorer() to the score service."
Treehugger Robot [Tue, 10 Jan 2017 21:15:01 +0000 (21:15 +0000)]
Merge "Remove unused variable."
Jeremy Joslin [Tue, 10 Jan 2017 21:08:32 +0000 (13:08 -0800)]
Move getActiveScorerPackage() to the score service.
Implemented getActiveScorerPackage() in the NetworkScoreService to
make it more efficient (no need to query PM).
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
33781558
Change-Id: I2144351c2c09cad30f80399069364f3572e38445
Jeremy Joslin [Tue, 10 Jan 2017 16:53:02 +0000 (08:53 -0800)]
Cleanup test method names.
Renamed some test methods to reflect the proper permission.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
1764042
Change-Id: Ia7db8826ad18c3b8f119aa063cb2c7b3793a9d17
Merged-In: I5551ddcb411432c6aeb14c03d9a284aa68f1bd1b
mike dooley [Tue, 20 Dec 2016 16:55:17 +0000 (08:55 -0800)]
Adding extra key to indicate when the last emergency call was made.
This can be used to determine if an incoming call is potentially
an emergency callback.
Bug:
30952524
Test: none
Change-Id: I2d4ca8e6885c0314394b3a2ad389ad8115b79156
Robert Sesek [Fri, 2 Dec 2016 22:27:50 +0000 (17:27 -0500)]
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
This refactors the whitelist to be a class, rather than just a static C array.
The whitelist can then be augmented dynamically when the package path is known
in the webview_zygote.
Test: m
Test: sailfish boots
Test: Enable Multi-process WebView in developer options, perform a search in GSA.
Bug:
21643067
Change-Id: Ia1f2535c7275b42b309631b4fe7859c30cbf7309
(cherry picked from commit
061ee3088a79ab0e07d37d1c0897d51422f29c4e)
Robert Sesek [Fri, 16 Dec 2016 19:02:31 +0000 (14:02 -0500)]
Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
(cherry picked from commit
44afe8be8f654192dc436a9c4238a925c22b14bf)
Test: m
Test: sailfish boots
Change-Id: I9ca93f31f6c20b702b2207333a9d56f6592630b0
Narayan Kamath [Mon, 7 Nov 2016 19:59:29 +0000 (19:59 +0000)]
Zygote: Additional whitelisting for legacy devices.
On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.
Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.
(cherry picked from commit
5e2f7c6229d7191183888d685b57a7d0a2835fce)
Bug:
32691930
Test: manual
Change-Id: If5b53f6f0a707f8d36603c09bfd3f72dbfbbbb99
Tao Wu [Fri, 11 Nov 2016 18:42:02 +0000 (10:42 -0800)]
Remove unused variable.
Code search show nobody referenced it and aosp image still compiles after
remove it.
Test: make -j18 systemimage userdataimage ramdisk
Change-Id: I3e37ea590610091b938296c999dceb3caf919906
Merged-In: I3e37ea590610091b938296c999dceb3caf919906
Signed-off-by: Tao Wu <lepton@google.com>
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
Bug:
32618130
Test: m
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
Calin Juravle [Tue, 10 Jan 2017 18:58:03 +0000 (18:58 +0000)]
Merge "Add an extra debug flag to BackgroundDexOptimizer"
Jeremy Joslin [Tue, 10 Jan 2017 00:22:20 +0000 (16:22 -0800)]
Moved isCallerActiveScorer() to the score service.
Implemented isCallerActiveScorer() in the NetworkScoreService to make
it more efficient (no need to query PM). Exposed the call as a new
internal API on NetworkScoreManager and deprecated the call on
NetworkScorerAppManager.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
33781558
Change-Id: I0e2142af95b068d322343f7c9362ac53d46b545e
John Reck [Tue, 10 Jan 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Remove unused variable."
TreeHugger Robot [Tue, 10 Jan 2017 18:35:40 +0000 (18:35 +0000)]
Merge "Cleanup test method names."
Chris Craik [Tue, 10 Jan 2017 18:15:53 +0000 (18:15 +0000)]
Merge "Revert "Revert "Fast-path for ViewGroup#invalidateChild, invalidate tests"""
Mark Renouf [Tue, 10 Jan 2017 17:53:08 +0000 (17:53 +0000)]
Merge "Update javadoc for startActivityForResult(Intent, int, Bundle)"
Justin Klaassen [Tue, 10 Jan 2017 17:43:05 +0000 (17:43 +0000)]
Merge "Add AlarmClock#SHOW_TIMERS"
TreeHugger Robot [Tue, 10 Jan 2017 17:32:52 +0000 (17:32 +0000)]
Merge "Additional unit tests for isProvisioningAllowed"
Jeremy Joslin [Tue, 10 Jan 2017 16:53:02 +0000 (08:53 -0800)]
Cleanup test method names.
Renamed some test methods to reflect the proper permission.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
1764042
Change-Id: I5551ddcb411432c6aeb14c03d9a284aa68f1bd1b
Geoffrey Pitsch [Tue, 10 Jan 2017 16:20:10 +0000 (16:20 +0000)]
Merge "API improvements for creating NotificationChannels"
Sean Stout [Mon, 5 Dec 2016 22:05:03 +0000 (14:05 -0800)]
Add AlarmClock#SHOW_TIMERS
Test: run cts -m CtsContentTestCases
Bug:
31228110
Change-Id: Ia291a890b83996d6edf7b75afa52e44557a9117b
Nicolas Prevot [Tue, 10 Jan 2017 11:32:43 +0000 (11:32 +0000)]
Additional unit tests for isProvisioningAllowed
Test it with disallow add / remove managed profile user restrictions.
BUG:
32629873
Test: adb shell am instrument -e class
com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic6b01c2b0ed9081204801a6c5719b0fd25eafbba
Bryce Lee [Tue, 10 Jan 2017 15:24:20 +0000 (15:24 +0000)]
Merge "Amend logic for sending power hint on activity start."
Philipp Weiß [Tue, 10 Jan 2017 14:14:32 +0000 (14:14 +0000)]
Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev am:
a7c6324340
am:
418f072a0e
Change-Id: I0c765230dbcc82b05a488ad2f5e66cf20ef90551
phweiss [Tue, 10 Jan 2017 14:13:18 +0000 (14:13 +0000)]
Re-Add VPN-"Settings" button to QSFooter dialog am:
d361b181e5
am:
a524313118
Change-Id: Ifde3ad732f22e220f04d9e64de455070e42cb440
phweiss [Tue, 10 Jan 2017 14:12:06 +0000 (14:12 +0000)]
Dismiss network logging notification when disabling logging am:
971236480c
am:
0a5882980b
Change-Id: I37be8068c3c77b6ca45b1f4f831fcc7562630458
Philipp Weiß [Tue, 10 Jan 2017 14:03:04 +0000 (14:03 +0000)]
Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev
am:
a7c6324340
Change-Id: Ia0265e6401a9c3bee533383988755da02e6a251c
phweiss [Tue, 10 Jan 2017 14:02:57 +0000 (14:02 +0000)]
Re-Add VPN-"Settings" button to QSFooter dialog
am:
d361b181e5
Change-Id: Iee7dcfbb4a2bcaaddada850918185fc4d9cc47c1
phweiss [Tue, 10 Jan 2017 14:01:42 +0000 (14:01 +0000)]
Dismiss network logging notification when disabling logging
am:
971236480c
Change-Id: I7f47b6318ef8c4b792115c2721a0d56dc6cdbfd3
Philipp Weiß [Tue, 10 Jan 2017 13:54:25 +0000 (13:54 +0000)]
Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev
Andrew Scull [Tue, 10 Jan 2017 13:20:46 +0000 (13:20 +0000)]
Merge "Evict CE key on request and when work mode is turned off."
Ben Weiss [Tue, 10 Jan 2017 11:10:31 +0000 (11:10 +0000)]
Merge "Make ArcMotion material spec compliant"
phweiss [Mon, 9 Jan 2017 14:56:00 +0000 (15:56 +0100)]
Re-Add VPN-"Settings" button to QSFooter dialog
Button was removed during a redesign of the dialog in the case
of active device owner. However, when no DO is set, the button should
still be there.
Also, when VPN configuration is restricted, do not show the button, and
also do not show the link that is visible in the DO-version of the dialog.
Bug:
34156553
Bug:
29748723
Test: manual
Change-Id: I177afdc94dc396754fc7703e4316edaa7ce104cd
(cherry picked from commit
a99a3f70e2a07e7c85d25fed1881d1a6ef70a93c)
phweiss [Mon, 9 Jan 2017 16:43:14 +0000 (17:43 +0100)]
Dismiss network logging notification when disabling logging
Bug:
34116213
Bug:
29748723
Test: CTSVerifier in a separate CL.
Change-Id: Ie652505ff57665f626712c67837577833f1595d6
(cherry picked from commit
82ed31c1efeb98acba60d79d1fc0a291b1440dc2)
Philipp Weiß [Tue, 10 Jan 2017 10:15:23 +0000 (10:15 +0000)]
Merge "Dismiss network logging notification when disabling logging"
Philipp Weiß [Tue, 10 Jan 2017 10:14:34 +0000 (10:14 +0000)]
Merge "Re-Add VPN-"Settings" button to QSFooter dialog"
Bill Yi [Tue, 10 Jan 2017 07:31:47 +0000 (07:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3faf3467e3 -s ours
am:
aa92e65ff8 -s ours
Change-Id: I46d8d8d89b23c3b162708112e706ead5562e6d82
Bill Yi [Tue, 10 Jan 2017 07:30:39 +0000 (07:30 +0000)]
Import translations. DO NOT MERGE am:
5ef189ddeb -s ours
am:
ae3786a8b9 -s ours
Change-Id: I510a6275a8ca73be7d49aeb14ee27a295e8a635c
Bill Yi [Tue, 10 Jan 2017 07:29:29 +0000 (07:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
0ffe43ecd7 -s ours
am:
856bfc2019 -s ours
Change-Id: Id6431aeb418700ed20636fe6f369195d1501efb7
Bill Yi [Tue, 10 Jan 2017 07:28:30 +0000 (07:28 +0000)]
Import translations. DO NOT MERGE am:
4fcf5b1813 -s ours
am:
f685b49b28 -s ours
Change-Id: Ie333b72281a1f4aaf6d186a09f25e34d8a9c42f7
Bill Yi [Tue, 10 Jan 2017 07:21:29 +0000 (07:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3faf3467e3 -s ours
Change-Id: Ibbdb7922b216c0c3ffeeccd1b2a02a8a8841ac47
Bill Yi [Tue, 10 Jan 2017 07:21:23 +0000 (07:21 +0000)]
Import translations. DO NOT MERGE
am:
5ef189ddeb -s ours
Change-Id: I34abef81d61a5b9f566bbb2877271ed7ea72a977
TreeHugger Robot [Tue, 10 Jan 2017 07:19:39 +0000 (07:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 10 Jan 2017 07:19:28 +0000 (07:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
0ffe43ecd7 -s ours
Change-Id: I06a438a8cf7de8effc3d62912c1bf8761ad08d59
Bill Yi [Tue, 10 Jan 2017 07:19:24 +0000 (07:19 +0000)]
Import translations. DO NOT MERGE
am:
4fcf5b1813 -s ours
Change-Id: Ie1da6f2d65250668afc630ccbfa61b7531c2721e
TreeHugger Robot [Tue, 10 Jan 2017 07:14:25 +0000 (07:14 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 10 Jan 2017 07:13:37 +0000 (07:13 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 10 Jan 2017 07:12:54 +0000 (07:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 10 Jan 2017 07:12:11 +0000 (07:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Jeff Sharkey [Tue, 10 Jan 2017 01:21:21 +0000 (18:21 -0700)]
Wire up storage stats API to installd.
Now that installd has the implementation details we need, we can wire
up the public APIs to use them.
Shuffle APIs around a bit so that StorageStats can be reused for both
UID and UserHandle results, and rename StorageSummary to
ExternalStorageStats. Provide getTotalBytes() and getFreeBytes() as
first-class methods so we can answer those questions quickly without
paying the cost of measuring external storage details.
Current costs on a typical device with a test account after flushing
dentry caches:
queryStatsForUid() manual: 6922ms
queryStatsForUid() quota: 525ms
queryStatsForUser() manual: 1686ms
queryStatsForUser() quota: 113ms
queryExternalStatsForUser() manual: 42ms
queryExternalStatsForUser() quota: 2ms
For verification purposes, a new "fw.verify_storage" system property
can be set to compute both manual and quota statistics, and log any
discrepancies.
Test: builds, boots
Bug:
27948817,
32206268
Change-Id: I4ea3df3372a7379aa8cf4c20c44120c8f0702c15
Jeff Sharkey [Tue, 10 Jan 2017 04:52:50 +0000 (04:52 +0000)]
Merge "Methods to calculate user and external disk usage." am:
6a9ad14172 am:
7beb2b75a9 am:
669affdb8e
am:
91b91b7f86
Change-Id: I7859db9f53560ad602bb26f37854bdfc02f15d09
Jeff Sharkey [Tue, 10 Jan 2017 04:47:47 +0000 (04:47 +0000)]
Merge "Methods to calculate user and external disk usage." am:
6a9ad14172 am:
7beb2b75a9
am:
669affdb8e
Change-Id: I698dd15a397f16dd2358729362860443f7e81a33
OSDN Git Service
