OSDN Git Service
Jack Yu [Fri, 5 May 2017 20:58:31 +0000 (20:58 +0000)]
Merge "Moved channels settings from carrier config to resources"
Abodunrinwa Toki [Fri, 5 May 2017 20:41:59 +0000 (20:41 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev am:
6dcae2b91f
am:
4aeea2404c
Change-Id: I2ef8f172023446def205cfd0b3e6384ab12fee7a
Akira Oshimi [Fri, 5 May 2017 20:38:47 +0000 (20:38 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev am:
ea4e770ed9
am:
29d4a4bb5c
Change-Id: Id6dd28e0c3c632b1df66824c5e6fd106323ae3f4
Abodunrinwa Toki [Fri, 5 May 2017 20:35:04 +0000 (20:35 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev
am:
6dcae2b91f
Change-Id: I34bd3e3833d5d7cd52264a5aa34bee18c51bb095
Akira Oshimi [Fri, 5 May 2017 20:32:52 +0000 (20:32 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev
am:
ea4e770ed9
Change-Id: I0f385dd77dd42d1ad8ddc3784c0b5c8d1181a596
TreeHugger Robot [Fri, 5 May 2017 20:29:27 +0000 (20:29 +0000)]
Merge "Reject smart selection if outside original selection." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:25:44 +0000 (20:25 +0000)]
Merge "Update carrier text when phone service state is changed" into oc-dev
Makoto Onuki [Fri, 5 May 2017 20:24:45 +0000 (20:24 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev am:
9ccb15a351
am:
f14f38ba4a
Change-Id: Idba763e56af1fa6e76ddbb3d8880f7eb78c944f3
Rebecca Silberstein [Fri, 5 May 2017 20:22:42 +0000 (20:22 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev am:
52fbde5255
am:
dd28278023
Change-Id: I8e56318a4d62330d31fb129439cd3ed26305f13a
Makoto Onuki [Fri, 5 May 2017 20:16:49 +0000 (20:16 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
am:
9ccb15a351
Change-Id: I7f246f362b6e8d124416db790e4856e52baa21b8
Colin Cross [Fri, 5 May 2017 20:13:30 +0000 (20:13 +0000)]
Update path for libmediandk headers
am:
0ece443558
Change-Id: Ie20fb4e2f256f31bbe1d414be15d4a91e0fcd1e2
Rebecca Silberstein [Fri, 5 May 2017 20:11:22 +0000 (20:11 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev
am:
52fbde5255
Change-Id: I6aaf92372ec62b1d7775492b56ac908f09cf056f
Makoto Onuki [Fri, 5 May 2017 20:11:02 +0000 (20:11 +0000)]
Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:04:14 +0000 (20:04 +0000)]
Merge "WifiManagerTest: alt way to check callback" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 20:03:50 +0000 (20:03 +0000)]
Merge "Merge "Create auxiliary info for local instant apps" into oc-dev am:
4804e41574 am:
143ad7ff09"
Colin Cross [Fri, 5 May 2017 00:58:11 +0000 (17:58 -0700)]
Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.
Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit
c8ed45d38f3b42e06c9e0980e133a84181752b5e)
Todd Kennedy [Fri, 5 May 2017 20:02:48 +0000 (20:02 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev am:
4804e41574
am:
143ad7ff09
Change-Id: I7bde4770ba29b8e57acd62cbe3a56c986a99bc80
Colin Cross [Fri, 5 May 2017 20:02:00 +0000 (20:02 +0000)]
Merge "Update path for libmediandk headers"
Todd Kennedy [Fri, 5 May 2017 19:56:16 +0000 (19:56 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
am:
4804e41574
Change-Id: I181cb62756b16971b126c2174eea58788dd5bfea
Sergey Vasilinets [Fri, 5 May 2017 19:56:10 +0000 (19:56 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev am:
01a5cc9004
am:
9c29d93ee3
Change-Id: I85f853aee80cbe9659c646468d35fbd15a5a45d4
Sergey Vasilinets [Fri, 5 May 2017 19:51:04 +0000 (19:51 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
am:
01a5cc9004
Change-Id: I52ea2290a175df2dcd5b3805f7e5943e387133da
TreeHugger Robot [Fri, 5 May 2017 19:43:43 +0000 (19:43 +0000)]
Merge "Implement CACert queries in SecurityController"
TreeHugger Robot [Fri, 5 May 2017 19:35:22 +0000 (19:35 +0000)]
Merge "Create auxiliary info for local instant apps" into oc-dev
Sergey Vasilinets [Fri, 5 May 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Add StrictMode.noteSlowCall to calls that result in hw bitmap readback" into oc-dev
Daniel Nishi [Fri, 5 May 2017 19:27:28 +0000 (19:27 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev am:
4e9002e69a
am:
1e41528706
Change-Id: I80b58e892f8e10f52454f5377daa90b276827f44
Amith Yamasani [Fri, 5 May 2017 19:25:11 +0000 (19:25 +0000)]
Merge "Update process state after unbinding a service." into oc-dev am:
f57b93cd0a
am:
dccddf02a9
Change-Id: I8f4082ac526cdfa6f206ffcdbbc498c38bbfff48
Arun [Fri, 5 May 2017 19:22:01 +0000 (19:22 +0000)]
Merge "Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164 am:
94f4f5e45f am:
b5facc7516" into oc-dev-plus-aosp
am:
5d3f297b1f
Change-Id: I54ef1955da9808c8e47aba660beba7c5e98403bd
Daniel Nishi [Fri, 5 May 2017 19:16:56 +0000 (19:16 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
am:
4e9002e69a
Change-Id: Ief5f223fd09e6cb78e903276a2270c6fbae2e0cf
Seigo Nonaka [Fri, 5 May 2017 19:15:24 +0000 (19:15 +0000)]
Merge "Resolve styles by font table if not specified." into oc-dev am:
1ea3a2600b
am:
c000acd771
Change-Id: I7dc5268ddea18dfda560742b370388860dd87344
Amith Yamasani [Fri, 5 May 2017 19:15:05 +0000 (19:15 +0000)]
Merge "Update process state after unbinding a service." into oc-dev
am:
f57b93cd0a
Change-Id: I9d880df13dec03cf5604c197c5bc4ee99a455693
Android Build Merger (Role) [Fri, 5 May 2017 19:11:26 +0000 (19:11 +0000)]
Merge "Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164 am:
94f4f5e45f am:
b5facc7516" into oc-dev-plus-aosp
Arun [Fri, 5 May 2017 19:10:21 +0000 (19:10 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164 am:
94f4f5e45f
am:
b5facc7516
Change-Id: I9e96bf83ae5ebd4237fc4d78a58e83793de86aad
Geoffrey Pitsch [Fri, 5 May 2017 19:07:18 +0000 (19:07 +0000)]
Merge "Revert "Treat apps that use channels as O apps"" into oc-dev am:
e2361d978b
am:
ad2f0735b8
Change-Id: I4a4f6d3319ed7251ce5e3de1dece65ae62c72397
Seigo Nonaka [Fri, 5 May 2017 19:05:18 +0000 (19:05 +0000)]
Merge "Resolve styles by font table if not specified." into oc-dev
am:
1ea3a2600b
Change-Id: I8c99a582e4453ec0dfbe6e30650b6682f68e255a
Arun [Fri, 5 May 2017 19:04:45 +0000 (19:04 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements" am:
057c7c3164
am:
94f4f5e45f
Change-Id: I163bfb74ded3d7eacc5221980733099ca1d90002
Geoffrey Pitsch [Fri, 5 May 2017 19:01:40 +0000 (19:01 +0000)]
Merge "Revert "Treat apps that use channels as O apps"" into oc-dev
am:
e2361d978b
Change-Id: I3364dd67095ffcf25a4d33e0c25cc93d2cc7aa50
Ajay Panicker [Fri, 5 May 2017 19:00:50 +0000 (19:00 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev am:
73971b2a43
am:
8ddad99cd1
Change-Id: Id38a953fb7012af08dc28cfd28aeb2bcc6d2ba2e
Arun [Fri, 5 May 2017 18:58:47 +0000 (18:58 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
am:
057c7c3164
Change-Id: I32269ea47f637597efc73acc4e040c209b48a2ed
Daniel Nishi [Fri, 5 May 2017 18:57:41 +0000 (18:57 +0000)]
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
Ajay Panicker [Fri, 5 May 2017 18:55:41 +0000 (18:55 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
am:
73971b2a43
Change-Id: I899cf09b716c4b28c829f96e15760a897d45e293
TreeHugger Robot [Fri, 5 May 2017 18:51:56 +0000 (18:51 +0000)]
Merge "Update process state after unbinding a service." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Resolve styles by font table if not specified." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:50:52 +0000 (18:50 +0000)]
Merge "Revert "Treat apps that use channels as O apps"" into oc-dev
Treehugger Robot [Fri, 5 May 2017 18:50:11 +0000 (18:50 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
Ajay Panicker [Fri, 5 May 2017 18:45:08 +0000 (18:45 +0000)]
Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 18:24:40 +0000 (18:24 +0000)]
Merge "Merge "Fixing regression in what is considered a restart attempt" into oc-dev am:
9fb50954e1 am:
3c9e0d4232"
Akira Oshimi [Tue, 31 Jan 2017 05:34:59 +0000 (14:34 +0900)]
Update carrier text when phone service state is changed
The carrier text is not updated when the phone service state has
changed. To solve this issue, the EmergencyCryptkeeperText view should
receive the KeyguardUpdateMonitorCallback#onRefreshCarrierInfo().
Bug:
37331677
Test: visual
Change-Id: I359991688552b731eaa02f443902eb7bdc894d10
(cherry picked from commit
76c36c4dc5eb2195c918590b23c16f6410a52df0)
Winson Chung [Fri, 5 May 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev am:
9fb50954e1
am:
3c9e0d4232
Change-Id: Ib97acab28ba27de9f3d91c6e63b02846eea0d140
Winson Chung [Fri, 5 May 2017 18:17:58 +0000 (18:17 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev am:
9fb50954e1
am:
3c9e0d4232
Change-Id: I46bbb4746b4c1d8e379e4879733f83f227bb7963
TreeHugger Robot [Fri, 5 May 2017 18:15:35 +0000 (18:15 +0000)]
Merge "Fix problem where wrong colors would be picked"
Winson Chung [Fri, 5 May 2017 18:11:46 +0000 (18:11 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev
am:
9fb50954e1
Change-Id: Iecb3788c10b4a5dbac5ed0a741fe04a2950d1033
Rebecca Silberstein [Tue, 2 May 2017 20:21:00 +0000 (13:21 -0700)]
WifiManagerTest: alt way to check callback
We are seeing failures on automated tests. This is occuring when the
thread id is retrieved from the TestLooper. Since we do not have
control over exactly which thread is used in the TestLooper for these
environments, this CL changes the checks to make sure the the callback
is called, and also that we never attempt to get the main looper (the
behavior when the provided handler is null).
Bug:
37828843
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I853c423b5f383225c250357d638c4cfd2c098edc
Android Build Merger (Role) [Fri, 5 May 2017 18:05:14 +0000 (18:05 +0000)]
Merge "Merge "TextClassifier: Remove debug logs." into oc-dev am:
dc4fc1ebc2 am:
79c87bdf20"
Abodunrinwa Toki [Fri, 5 May 2017 18:04:20 +0000 (18:04 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev am:
dc4fc1ebc2
am:
79c87bdf20
Change-Id: I5c954b4d49f4aaabe4a7aa12894a4a41d4a8715d
TreeHugger Robot [Fri, 5 May 2017 18:03:49 +0000 (18:03 +0000)]
Merge "Fixing regression in what is considered a restart attempt" into oc-dev
Abodunrinwa Toki [Fri, 5 May 2017 18:01:37 +0000 (18:01 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev am:
dc4fc1ebc2
am:
79c87bdf20
Change-Id: I6293ee9dbe6291b486ffd9b8fe01d1dcbe5cf96c
Abodunrinwa Toki [Fri, 5 May 2017 17:55:41 +0000 (17:55 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev
am:
dc4fc1ebc2
Change-Id: Ie5d929f463a1917f4e9d4f83e32ba95f359d041a
TreeHugger Robot [Fri, 5 May 2017 17:49:38 +0000 (17:49 +0000)]
Merge "TextClassifier: Remove debug logs." into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 17:45:48 +0000 (17:45 +0000)]
Merge "Merge "Add wifi throttling to backup blacklist." into oc-dev am:
2cd2d23440 am:
ff910928dc"
Wei Wang [Fri, 5 May 2017 17:43:18 +0000 (17:43 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev am:
2cd2d23440
am:
ff910928dc
Change-Id: Ifa5f566c639e50408b0b8fd831cf2be5049ddc30
Todd Kennedy [Fri, 5 May 2017 17:15:38 +0000 (17:15 +0000)]
Create auxiliary info for local instant apps
This reverts commit
a1d8051fa2317d897a6b20442177e357172e93db.
Change-Id: Ic471a4efe64406dd75cc0bf1d6464276a94347d8
Fixes:
37947648
Test: Manual
Test: Install an instant app [https://www.nytimes.com/crosswords/game/mini]
Test: Try to run installed instant app from gMail
Wei Wang [Fri, 5 May 2017 17:33:43 +0000 (17:33 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev am:
2cd2d23440
am:
ff910928dc
Change-Id: I96f88ffe9e8335b6a95f8fff70853c9334227305
Wei Wang [Fri, 5 May 2017 17:23:35 +0000 (17:23 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev
am:
2cd2d23440
Change-Id: Ibfa48a05769784cf688e5b35695c3a8369ac263c
Bill Yi [Fri, 5 May 2017 17:18:44 +0000 (17:18 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 5 May 2017 17:15:48 +0000 (17:15 +0000)]
Merge "Add wifi throttling to backup blacklist." into oc-dev
Daniel Sandler [Fri, 5 May 2017 17:08:58 +0000 (17:08 +0000)]
Merge "Make status bar disable() debugging more concise." into oc-dev am:
e39fa61e0b
am:
1cb53d6888
Change-Id: I0b0b6744a7035bb092cc42eed29cec00dcb4a0df
Abodunrinwa Toki [Fri, 5 May 2017 17:07:17 +0000 (18:07 +0100)]
Reject smart selection if outside original selection.
- The aim is to be defensive and prefer to reject a selection if
it is likely to be wrong.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
38019270
Change-Id: I35ebc84fb102373949366296434a31d899edfef3
phweiss [Wed, 19 Apr 2017 18:15:06 +0000 (20:15 +0200)]
Implement CACert queries in SecurityController
Queries are run (on a AsyncTask) when user is switched and when
ACTION_TRUST_STORE_CHANGED is broadcasted. Otherwise, the result is cached
in the SecurityController.
Bug:
37535489
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java
Change-Id: I3b9cc3d85c9f49d0a892613b63d1fba184ab647e
Daniel Sandler [Fri, 5 May 2017 17:01:07 +0000 (17:01 +0000)]
Merge "Make status bar disable() debugging more concise." into oc-dev
am:
e39fa61e0b
Change-Id: I13a6417ab49e03a8c636740d59068dd5dc7d702d
Bryce Lee [Fri, 5 May 2017 16:54:46 +0000 (16:54 +0000)]
Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev am:
a087127e77
am:
ffd0dd6981
Change-Id: I15263e86264b7cd167c67648ddea5cdce27913cf
Geoffrey Pitsch [Fri, 5 May 2017 16:52:15 +0000 (16:52 +0000)]
Merge "Fix settings test for show_notification_channel_warnings" into oc-dev am:
2d2689add7
am:
43a5185a43
Change-Id: I2037766561cc7f590daa1f6a58482e7c5bd189f4
Geoffrey Pitsch [Fri, 5 May 2017 16:47:38 +0000 (16:47 +0000)]
Revert "Treat apps that use channels as O apps"
This reverts commit
07a08b2ae92cc26b5e7ec00064e6ecea79d3d9c3.
Bug:
38016678
Change-Id: I0bf2f6da9e145bfe1f79449cac38ad34f5956969
Daniel Sandler [Fri, 5 May 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Make status bar disable() debugging more concise." into oc-dev
Bryce Lee [Fri, 5 May 2017 16:46:20 +0000 (16:46 +0000)]
Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev
am:
a087127e77
Change-Id: I3c8bfb7fb2961dfef71b7903f78d20ff21f0dc84
Rebecca Silberstein [Fri, 5 May 2017 16:40:15 +0000 (16:40 +0000)]
Merge "WifiManagerTest: test for startLOHS return code" into oc-dev am:
f8d909c14a
am:
fa82e296c3
Change-Id: I0c942308c45fcef49afc29a1a533524124a8883a
Eino-Ville Talvala [Fri, 5 May 2017 16:37:28 +0000 (16:37 +0000)]
Merge "Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev am:
97258cd731" into oc-dev-plus-aosp
am:
74d76f406b
Change-Id: I0ace22eb4cb7e4c90baf3ff066a400e609f5e620
Geoffrey Pitsch [Fri, 5 May 2017 16:36:21 +0000 (16:36 +0000)]
Merge "Fix settings test for show_notification_channel_warnings" into oc-dev
am:
2d2689add7
Change-Id: Iac6657120054846aafff07b2335b631e350a7445
Seigo Nonaka [Thu, 4 May 2017 23:39:28 +0000 (16:39 -0700)]
Resolve styles by font table if not specified.
android:fontStyle and android:fontWeight is an optional attribute.
If they are missing, we are using non-italic 400 weight, but this is
not good idea. We should resolve these style value from font metadata.
Bug:
37988154
Test: am instrument -w -e class android.content.res.cts.ResourcesTest
android.content.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I80a436cd3632d8c58fa3d8bdaedac73b95f61a8c
Bryce Lee [Fri, 5 May 2017 16:29:37 +0000 (16:29 +0000)]
Merge "Prevent NPE in ActivityStack#shouldbeVisible." into oc-dev
Neil Fuller [Fri, 5 May 2017 16:26:17 +0000 (16:26 +0000)]
Merge "Add (disabled) time zone update system server impl" into oc-dev-plus-aosp
am:
1c5c8a4a3b -s ours
Change-Id: If6e1835966e8de9e6d64c547f4e259783b083f67
Rebecca Silberstein [Fri, 5 May 2017 16:23:54 +0000 (16:23 +0000)]
Merge "WifiManagerTest: test for startLOHS return code" into oc-dev
am:
f8d909c14a
Change-Id: I0f43de95419ba442d53b676f1129f0782d2aac71
Android Build Merger (Role) [Fri, 5 May 2017 16:23:08 +0000 (16:23 +0000)]
Merge "Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev am:
20d2450da4 am:
2883162a59"
Winson Chung [Fri, 5 May 2017 16:22:19 +0000 (16:22 +0000)]
Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev am:
20d2450da4
am:
2883162a59
Change-Id: I39f56f3247cb44a2dd58f2fe47065e23e4f3827f
TreeHugger Robot [Fri, 5 May 2017 16:20:53 +0000 (16:20 +0000)]
Merge "Fix settings test for show_notification_channel_warnings" into oc-dev
Android Build Merger (Role) [Fri, 5 May 2017 16:20:19 +0000 (16:20 +0000)]
Merge "Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev am:
97258cd731" into oc-dev-plus-aosp
TreeHugger Robot [Fri, 5 May 2017 16:16:31 +0000 (16:16 +0000)]
Merge "Add (disabled) time zone update system server impl" into oc-dev-plus-aosp
Eino-Ville Talvala [Fri, 5 May 2017 16:14:14 +0000 (16:14 +0000)]
Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev
am:
97258cd731
Change-Id: I1dc7bb61cbf636301aa12070732aff095ede9f2d
Winson Chung [Fri, 5 May 2017 16:12:53 +0000 (16:12 +0000)]
Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev am:
20d2450da4
am:
2883162a59
Change-Id: Ieab24986bbf88d8e7c8f3f87e85a60745317afee
Bryce Lee [Fri, 5 May 2017 16:10:51 +0000 (16:10 +0000)]
Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev am:
8cfb1a95da
am:
fb19563972
Change-Id: I80322c13e9fb5926432ea660f0b143f9aa78e315
Neil Fuller [Thu, 16 Mar 2017 18:32:21 +0000 (18:32 +0000)]
Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.
The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.
The updater is then required to communicate with the
data app and report back to the system server.
Unit tests are included for the major components.
To run:
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"
This contains a cherry-pick / conflict resolution of
commit
68f666693a465eb8a66d9252b7b7ac035b9f0b7b after an automerger skip.
(cherry picked from commit
68f666693a465eb8a66d9252b7b7ac035b9f0b7b)
Test: See above.
Bug:
31008728
Merged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Rebecca Silberstein [Fri, 5 May 2017 16:06:50 +0000 (16:06 +0000)]
Merge "WifiManagerTest: test for startLOHS return code" into oc-dev
Eino-Ville Talvala [Fri, 5 May 2017 16:06:03 +0000 (16:06 +0000)]
Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev
Winson Chung [Fri, 5 May 2017 16:03:04 +0000 (16:03 +0000)]
Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev
am:
20d2450da4
Change-Id: Ia1847864ba71c80870e550c653f9c3cb1c91267c
Android Build Merger (Role) [Fri, 5 May 2017 16:01:29 +0000 (16:01 +0000)]
Merge "Merge "Merge "Convert libhwui to Android.bp" am:
31fb17bbf9 am:
f0d951361b am:
ab8ed8b4e4 -s ours" into oc-dev-plus-aosp am:
55412c2525 -s ours"
Colin Cross [Fri, 5 May 2017 16:00:10 +0000 (16:00 +0000)]
Merge "Merge "Convert libhwui to Android.bp" am:
31fb17bbf9 am:
f0d951361b am:
ab8ed8b4e4 -s ours" into oc-dev-plus-aosp
am:
55412c2525 -s ours
Change-Id: Ic0dff05b13b40b9400a986cc0ee5b2f3b1ece3ea
Android Build Merger (Role) [Fri, 5 May 2017 15:59:38 +0000 (15:59 +0000)]
Merge "Merge "Add TRON logging for bindApplication" into oc-dev am:
802d008e1b am:
fa5252f628"
Jorim Jaggi [Fri, 5 May 2017 15:58:53 +0000 (15:58 +0000)]
Merge "Add TRON logging for bindApplication" into oc-dev am:
802d008e1b
am:
fa5252f628
Change-Id: I76fe64031bb9ad22d77be8dcce4923831242079a
Android Build Merger (Role) [Fri, 5 May 2017 15:58:06 +0000 (15:58 +0000)]
Merge "Merge "Audio service: always unduck focus winner" into oc-dev am:
a78b6e7757 am:
87c49233f3"
Jean-Michel Trivi [Fri, 5 May 2017 15:57:14 +0000 (15:57 +0000)]
Merge "Audio service: always unduck focus winner" into oc-dev am:
a78b6e7757
am:
87c49233f3
Change-Id: I5af140a52e428cf9c2ef8b0501e86d12295e1a30
Android Build Merger (Role) [Fri, 5 May 2017 15:56:47 +0000 (15:56 +0000)]
Merge "Merge "Fix bounds calculation" into oc-dev am:
d1422b56ad am:
395d9acb46"
OSDN Git Service
