drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
320,780 Commits 1 Branch 0 Tags
Commit Graph

320780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rebecca Silberstein
11b16af5fa Merge "WifiManagerTest: test for startLOHS return code" into oc-dev am: f8d909c14a 
am: fa82e296c3

Change-Id: I0c942308c45fcef49afc29a1a533524124a8883a
 2017-05-05 16:40:15 +00:00
Eino-Ville Talvala
2e385f76f8 Merge "Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev am: 97258cd731" into oc-dev-plus-aosp 
am: 74d76f406b

Change-Id: I0ace22eb4cb7e4c90baf3ff066a400e609f5e620
 2017-05-05 16:37:28 +00:00
Neil Fuller
b4322d46c9 Merge "Add (disabled) time zone update system server impl" into oc-dev-plus-aosp 
am: 1c5c8a4a3b  -s ours

Change-Id: If6e1835966e8de9e6d64c547f4e259783b083f67
 2017-05-05 16:26:17 +00:00
Rebecca Silberstein
fa82e296c3 Merge "WifiManagerTest: test for startLOHS return code" into oc-dev 
am: f8d909c14a

Change-Id: I0f43de95419ba442d53b676f1129f0782d2aac71
 2017-05-05 16:23:54 +00:00
Android Build Merger (Role)
57243441d3 Merge "Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev am: 20d2450da4 am: 2883162a59" 2017-05-05 16:23:14 +00:00
Winson Chung
57738661ad Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev am: 20d2450da4 
am: 2883162a59

Change-Id: I39f56f3247cb44a2dd58f2fe47065e23e4f3827f
 2017-05-05 16:22:19 +00:00
Android Build Merger (Role)
74d76f406b Merge "Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev am: 97258cd731" into oc-dev-plus-aosp 2017-05-05 16:20:24 +00:00
TreeHugger Robot
1c5c8a4a3b Merge "Add (disabled) time zone update system server impl" into oc-dev-plus-aosp 2017-05-05 16:16:35 +00:00
Eino-Ville Talvala
e7bb0cf0f6 Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev 
am: 97258cd731

Change-Id: I1dc7bb61cbf636301aa12070732aff095ede9f2d
 2017-05-05 16:14:14 +00:00
Winson Chung
44a78c4f06 Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev am: 20d2450da4 
am: 2883162a59

Change-Id: Ieab24986bbf88d8e7c8f3f87e85a60745317afee
 2017-05-05 16:12:53 +00:00
Bryce Lee
d36d46dd27 Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev am: 8cfb1a95da 
am: fb19563972

Change-Id: I80322c13e9fb5926432ea660f0b143f9aa78e315
 2017-05-05 16:10:51 +00:00
Neil Fuller
056156f616 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
 2017-05-05 17:09:58 +01:00
Rebecca Silberstein
f8d909c14a Merge "WifiManagerTest: test for startLOHS return code" into oc-dev 2017-05-05 16:06:55 +00:00
Eino-Ville Talvala
97258cd731 Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev 2017-05-05 16:06:08 +00:00
Winson Chung
2883162a59 Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev 
am: 20d2450da4

Change-Id: Ia1847864ba71c80870e550c653f9c3cb1c91267c
 2017-05-05 16:03:04 +00:00
Android Build Merger (Role)
d207bae658 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" 2017-05-05 16:01:36 +00:00
Colin Cross
3adfb7ffa8 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
 2017-05-05 16:00:10 +00:00
Android Build Merger (Role)
0988ec0705 Merge "Merge "Add TRON logging for bindApplication" into oc-dev am: 802d008e1b am: fa5252f628" 2017-05-05 15:59:43 +00:00
Jorim Jaggi
1a8c4ddcca Merge "Add TRON logging for bindApplication" into oc-dev am: 802d008e1b 
am: fa5252f628

Change-Id: I76fe64031bb9ad22d77be8dcce4923831242079a
 2017-05-05 15:58:53 +00:00
Android Build Merger (Role)
75395bccee Merge "Merge "Audio service: always unduck focus winner" into oc-dev am: a78b6e7757 am: 87c49233f3" 2017-05-05 15:58:13 +00:00
Jean-Michel Trivi
a5c8499e5e Merge "Audio service: always unduck focus winner" into oc-dev am: a78b6e7757 
am: 87c49233f3

Change-Id: I5af140a52e428cf9c2ef8b0501e86d12295e1a30
 2017-05-05 15:57:14 +00:00
Android Build Merger (Role)
1ec41fdf59 Merge "Merge "Fix bounds calculation" into oc-dev am: d1422b56ad am: 395d9acb46" 2017-05-05 15:56:53 +00:00
Jorim Jaggi
5e7a07a3da Merge "Fix bounds calculation" into oc-dev am: d1422b56ad 
am: 395d9acb46

Change-Id: Id343220eb2339249817122ce8950a9c14ee5be5f
 2017-05-05 15:56:01 +00:00
Android Build Merger (Role)
1b736794ab Merge "Merge "Merge "Add (disabled) time zone update system server impl" am: cba224e833 am: 0a6aeccab2 am: 5175e734a1 -s ours" into oc-dev-plus-aosp am: 8d878bcf58 -s ours" 2017-05-05 15:55:41 +00:00
Bryce Lee
fb19563972 Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev 
am: 8cfb1a95da

Change-Id: I63d6a84c78f52d9ee20bdf719ac4edbca34fb44d
 2017-05-05 15:54:41 +00:00
Neil Fuller
b5e3881b6d Merge "Merge "Add (disabled) time zone update system server impl" am: cba224e833 am: 0a6aeccab2 am: 5175e734a1 -s ours" into oc-dev-plus-aosp 
am: 8d878bcf58  -s ours

Change-Id: Iba26302a89a1fe8ea7268001e7b297b69a8028aa
 2017-05-05 15:54:38 +00:00
Android Build Merger (Role)
8a0c2d7b8c Merge "Merge "Don't set the failure extra on split install" into oc-dev am: d14e67656f am: 9968f9aa27" 2017-05-05 15:54:10 +00:00
Todd Kennedy
d86841e7cd Merge "Don't set the failure extra on split install" into oc-dev am: d14e67656f 
am: 9968f9aa27

Change-Id: I0d799cf7a9af9f3bad491aa58edc6f4aacae85bb
 2017-05-05 15:53:18 +00:00
Android Build Merger (Role)
7e4d7191d1 Merge "Merge "Create auxiliary info for local instant apps" into oc-dev am: d55670bcf5 am: b21b3efc55" 2017-05-05 15:52:59 +00:00
Winson Chung
20d2450da4 Merge "Ensure that we hide the menu without resizing when expanding." into oc-dev 2017-05-05 15:52:19 +00:00
Todd Kennedy
7a6eafb7a9 Merge "Create auxiliary info for local instant apps" into oc-dev am: d55670bcf5 
am: b21b3efc55

Change-Id: I3d656bbbb9610e9f4ea6e68fbd8a287e88ad6894
 2017-05-05 15:52:01 +00:00
Android Build Merger (Role)
55412c2525 Merge "Merge "Convert libhwui to Android.bp" am: 31fb17bbf9 am: f0d951361b am: ab8ed8b4e4 -s ours" into oc-dev-plus-aosp 2017-05-05 15:49:51 +00:00
Jorim Jaggi
fa5252f628 Merge "Add TRON logging for bindApplication" into oc-dev 
am: 802d008e1b

Change-Id: Idc3dba8c4559098b0b06d8159000fe7857675887
 2017-05-05 15:47:24 +00:00
Bryce Lee
8cfb1a95da Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev 2017-05-05 15:46:37 +00:00
Todd Kennedy
72f8c6b8fd Merge "Create auxiliary info for local instant apps" into oc-dev am: d55670bcf5 
am: b21b3efc55

Change-Id: If45de47325c3bc31b68649c3f8510c3bdf8ac4e4
 2017-05-05 15:46:03 +00:00
Colin Cross
418b5aa196 Merge "Convert libhwui to Android.bp" am: 31fb17bbf9 am: f0d951361b 
am: ab8ed8b4e4  -s ours

Change-Id: I483940304816785a10c8eaa5eff0def36c6d0a0d
 2017-05-05 15:45:44 +00:00
Jean-Michel Trivi
87c49233f3 Merge "Audio service: always unduck focus winner" into oc-dev 
am: a78b6e7757

Change-Id: I09bf332200f5f67b6832e1f94992d6e2eb053c02
 2017-05-05 15:45:26 +00:00
Bryce Lee
eeef17cc3a Merge "Finish noHistory activities immediately after resumed activity shown." into oc-dev am: c589f1b1f7 
am: 2f8f884ecf

Change-Id: I69b65f1f48069891217a9b164eeeaea495a957d8
 2017-05-05 15:41:14 +00:00
Colin Cross
ab8ed8b4e4 Merge "Convert libhwui to Android.bp" am: 31fb17bbf9 
am: f0d951361b

Change-Id: I30dee10c1e024777a3760d37cf5a80e79c083b2a
 2017-05-05 15:39:20 +00:00
Bryce Lee
a1d8051fa2 Revert "Create auxiliary info for local instant apps" 
This reverts commit e15e7cb592a923eea029c12aa9fc144a3fbaddc0.

Change-Id: I116904fd8c2b28df7e03bc5ec2414ed67761b380
 2017-05-05 15:38:44 +00:00
Jorim Jaggi
802d008e1b Merge "Add TRON logging for bindApplication" into oc-dev 2017-05-05 15:34:56 +00:00
Jean-Michel Trivi
a78b6e7757 Merge "Audio service: always unduck focus winner" into oc-dev 2017-05-05 15:33:47 +00:00
Colin Cross
f0d951361b Merge "Convert libhwui to Android.bp" 
am: 31fb17bbf9

Change-Id: I66401c892f90131e21efb36dc7316f905bd729d2
 2017-05-05 15:28:42 +00:00
TreeHugger Robot
59ec610072 Merge "Rename to TestableTests.apk" 2017-05-05 15:21:44 +00:00
Treehugger Robot
31fb17bbf9 Merge "Convert libhwui to Android.bp" 2017-05-05 15:17:23 +00:00
TreeHugger Robot
094f7ddfc0 Merge "Try to add some more documentation to testables" 2017-05-05 15:16:42 +00:00
Jorim Jaggi
395d9acb46 Merge "Fix bounds calculation" into oc-dev 
am: d1422b56ad

Change-Id: I302c46401b5251a0b82d0e704424bacd687893f8
 2017-05-05 15:06:26 +00:00
Jorim Jaggi
d1422b56ad Merge "Fix bounds calculation" into oc-dev 2017-05-05 14:59:44 +00:00
Tomasz Wasilczyk
8a3e865cf0 Merge "Dummy implementation get/setMute calls of ITuner." 2017-05-05 14:35:21 +00:00
Android Build Merger (Role)
8d878bcf58 Merge "Merge "Add (disabled) time zone update system server impl" am: cba224e833 am: 0a6aeccab2 am: 5175e734a1 -s ours" into oc-dev-plus-aosp 2017-05-05 14:33:55 +00:00