OSDN Git Service
TreeHugger Robot [Tue, 26 Sep 2017 21:26:53 +0000 (21:26 +0000)]
Merge "Remove obsolete & broken handling of precompiled sys apps"
TreeHugger Robot [Tue, 26 Sep 2017 21:04:49 +0000 (21:04 +0000)]
Merge "AAPT2: Move to proto3"
jackqdyulei [Tue, 26 Sep 2017 20:40:34 +0000 (20:40 +0000)]
Merge "Update the bt background color." into oc-mr1-dev am:
4a324cb196
am:
da95863025
Change-Id: I31e6dbb096f893c06bdf9613ec98ca4ba0869bf4
jackqdyulei [Tue, 26 Sep 2017 20:32:58 +0000 (20:32 +0000)]
Merge "Update the bt background color." into oc-mr1-dev
am:
4a324cb196
Change-Id: I3687c352e2fca5f56b0e52c99b79383088bff9b8
TreeHugger Robot [Tue, 26 Sep 2017 20:21:50 +0000 (20:21 +0000)]
Merge "Update the bt background color." into oc-mr1-dev
TreeHugger Robot [Tue, 26 Sep 2017 20:12:10 +0000 (20:12 +0000)]
Merge "A few fixes to AssetManager2 for compat"
Daniel Nishi [Tue, 26 Sep 2017 20:08:37 +0000 (20:08 +0000)]
Merge "Update diskstats to break out code & data."
Felipe Leme [Tue, 26 Sep 2017 19:56:49 +0000 (19:56 +0000)]
Merge "Re-add callback to onCancel() when screen is touched outside Save UI." into oc-mr1-dev am:
87794e95a2
am:
478a98a3d3
Change-Id: If5f3bd13aa86d21770cf50549bc880d2d7cce596
Felipe Leme [Tue, 26 Sep 2017 19:49:36 +0000 (19:49 +0000)]
Merge "Re-add callback to onCancel() when screen is touched outside Save UI." into oc-mr1-dev
am:
87794e95a2
Change-Id: I4d9f94d688aa27789112afb070e262b76aad8926
TreeHugger Robot [Tue, 26 Sep 2017 19:44:00 +0000 (19:44 +0000)]
Merge "WebView: add @Nullable and @NonNull annotations"
TreeHugger Robot [Tue, 26 Sep 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Re-add callback to onCancel() when screen is touched outside Save UI." into oc-mr1-dev
Phil Weaver [Tue, 26 Sep 2017 19:38:44 +0000 (19:38 +0000)]
Merge "Add null check in a11y callback" into oc-mr1-dev am:
4dfeb4f0e4
am:
0e8e7830fc
Change-Id: I88c8d335a4b91072d5e9bfcc4c2a7b21ec46565b
Calin Juravle [Tue, 26 Sep 2017 01:13:38 +0000 (18:13 -0700)]
Remove obsolete & broken handling of precompiled sys apps
During the times we used verify-profile for OTAs we had to ensure that
prebuilds do not regress by verifying at runtime. For that we added a
hackish check in PMS.
Now, we no longer use verify-profile and we have no configuration which
will leave the prebuilds unverified (assume-verify does not count here).
So, we can remove this check which blocks system apps to be compiled with
speed-profile.
(Also worth mentioning that
!Environment.getReferenceProfile(pkg.packageName).exists() was broken...
most likely because of an SElinux policy update which we did not handled
:/ )
Bug:
66903791
Test: build & boot
Change-Id: I981e463d61c42ab8455d489ff86cc300632a2a90
Phil Weaver [Tue, 26 Sep 2017 19:30:28 +0000 (19:30 +0000)]
Merge "Add null check in a11y callback" into oc-mr1-dev
am:
4dfeb4f0e4
Change-Id: Ibadc5f3fa1b2cd67998215a132f73bde7f1f4511
Bill Yi [Tue, 26 Sep 2017 19:27:21 +0000 (19:27 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours am:
46181531ec -s ours am:
c03209d495 -s ours" into oc-mr1-dev-plus-aosp
am:
9adc60ffe0 -s ours
Change-Id: Ia02750f919deebd14dbe76058f688b6893db5462
Bill Yi [Tue, 26 Sep 2017 19:23:35 +0000 (19:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours am:
46181531ec -s ours am:
133d4881ef -s ours
am:
64a7b9e43a -s ours
Change-Id: Ib23c7602cf0e3cbba93e22c5232adb2d205a2ebd
Phil Weaver [Tue, 26 Sep 2017 19:22:51 +0000 (19:22 +0000)]
Merge "Add null check in a11y callback" into oc-mr1-dev
Android Build Merger (Role) [Tue, 26 Sep 2017 19:18:31 +0000 (19:18 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours am:
46181531ec -s ours am:
c03209d495 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Tue, 26 Sep 2017 19:14:00 +0000 (19:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours am:
46181531ec -s ours
am:
c03209d495 -s ours
Change-Id: Icdad97761639fac03173c8a597f2d7e1739c05f3
Bill Yi [Tue, 26 Sep 2017 19:13:47 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours am:
46181531ec -s ours
am:
133d4881ef -s ours
Change-Id: I0bd053896b033b22691f76b7edfcf42a000b38b8
Adam Lesinski [Thu, 7 Sep 2017 16:39:07 +0000 (09:39 -0700)]
AAPT2: Move to proto3
We're going to be using the Any proto field in ConfigDescription,
so migrate to proto3.
Test: make aapt2_tests
Change-Id: I43b91f4dfc448251f4352e48586b3b15502c033d
TreeHugger Robot [Tue, 26 Sep 2017 19:04:56 +0000 (19:04 +0000)]
Merge "Fixing wrong actions were written to parcel when copying"
Bill Yi [Tue, 26 Sep 2017 19:04:06 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours
am:
46181531ec -s ours
Change-Id: Ic283086745e42fe4351c3817782e46ac9c93f1dd
Bill Yi [Tue, 26 Sep 2017 19:03:54 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4414109220 -s ours
am:
46181531ec -s ours
Change-Id: I2dab29638f0813d6e52c9b4ec7b279b7ddcb06a0
TreeHugger Robot [Tue, 26 Sep 2017 19:01:10 +0000 (19:01 +0000)]
Merge "Pass dumpsys priority to IServiceManager"
TreeHugger Robot [Tue, 26 Sep 2017 18:57:46 +0000 (18:57 +0000)]
Merge "Pass saved parameters to boot action"
Bill Yi [Tue, 26 Sep 2017 18:55:20 +0000 (18:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4414109220 -s ours
Change-Id: I3820c0c5decca7f1a839a40a65e9021fa6e999d1
Bill Yi [Tue, 26 Sep 2017 18:51:35 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours am:
5cf5642cbd -s ours am:
7b3e838ec1 -s ours am:
44b2b486ae -s ours" into oc-mr1-dev-plus-aosp
am:
3ebe42353b -s ours
Change-Id: I27171f119e96a7022924e3326c3e24358099c453
TreeHugger Robot [Tue, 26 Sep 2017 18:42:25 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Kweku Adams [Tue, 26 Sep 2017 18:38:35 +0000 (18:38 +0000)]
Merge "incidentd: creating PolicyProto for NotificationManager"
Bill Yi [Tue, 26 Sep 2017 18:34:47 +0000 (18:34 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours am:
5cf5642cbd -s ours am:
7b3e838ec1 -s ours am:
6aa3149404 -s ours
am:
173b7f3dc0 -s ours
Change-Id: I39f21eb245ecec48212c759ecaaee22109da94f7
Android Build Merger (Role) [Tue, 26 Sep 2017 18:30:39 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours am:
5cf5642cbd -s ours am:
7b3e838ec1 -s ours am:
44b2b486ae -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Tue, 26 Sep 2017 18:28:39 +0000 (18:28 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours am:
5cf5642cbd -s ours am:
7b3e838ec1 -s ours
am:
44b2b486ae -s ours
Change-Id: I17fc0537bcbe6b8c774bd953d8552efe0507e39e
Bill Yi [Tue, 26 Sep 2017 18:26:40 +0000 (18:26 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours am:
5cf5642cbd -s ours am:
7b3e838ec1 -s ours
am:
6aa3149404 -s ours
Change-Id: Id2fd9cc4fd371441d8212e7e2b9ec9f6a992e7c0
TreeHugger Robot [Tue, 26 Sep 2017 18:24:06 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 26 Sep 2017 18:21:56 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 26 Sep 2017 18:20:23 +0000 (18:20 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours am:
5cf5642cbd -s ours
am:
7b3e838ec1 -s ours
Change-Id: I4706a62f6bc875294a66ae70f157949b36df60a8
Bill Yi [Tue, 26 Sep 2017 18:20:20 +0000 (18:20 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours am:
5cf5642cbd -s ours
am:
7b3e838ec1 -s ours
Change-Id: Ied87a01867e75220346a2ea6d628b9b086ee58b3
Bill Yi [Tue, 26 Sep 2017 18:13:03 +0000 (18:13 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours am:
6cc2a9cdc2 -s ours
am:
5cf5642cbd -s ours
Change-Id: Ie5c5a0ddabdc8dc0bfd081c48c3c279425cc2682
Bill Yi [Tue, 26 Sep 2017 18:03:49 +0000 (18:03 +0000)]
Import translations. DO NOT MERGE am:
1df9bbaafe -s ours
am:
6cc2a9cdc2 -s ours
Change-Id: I4d3d9da8dcdc0c898c49856cae530c14f6aa915e
Bill Yi [Tue, 26 Sep 2017 17:53:44 +0000 (17:53 +0000)]
Import translations. DO NOT MERGE
am:
1df9bbaafe -s ours
Change-Id: I2bf2ceaea1279df64cf7409c57c75039caaa7879
TreeHugger Robot [Tue, 26 Sep 2017 17:14:41 +0000 (17:14 +0000)]
Merge "Rename TelephonyMonitor to ConnectivityMonitor"
John Reck [Tue, 26 Sep 2017 16:52:15 +0000 (16:52 +0000)]
Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev am:
2d362d7159
am:
a54a5f6512
Change-Id: I3e78ede76656eff16fce54808a052ab79105ae79
Sunny Goyal [Mon, 25 Sep 2017 17:02:59 +0000 (10:02 -0700)]
Fixing wrong actions were written to parcel when copying
Bug:
66901470
Test: Manual and CTS
Change-Id: I292e0e7d890d4da522045f434982aeeae35eb0fe
John Reck [Tue, 26 Sep 2017 16:34:45 +0000 (16:34 +0000)]
Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev
am:
2d362d7159
Change-Id: I7e2895fdb802c25389a689f87e60fe408c955405
Charles He [Tue, 26 Sep 2017 16:34:38 +0000 (16:34 +0000)]
Merge "AM: fix bug in moveTaskToBackLocked due to LockTask"
John Reck [Tue, 26 Sep 2017 16:23:43 +0000 (16:23 +0000)]
Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev
Felipe Leme [Tue, 26 Sep 2017 16:01:59 +0000 (09:01 -0700)]
Re-add callback to onCancel() when screen is touched outside Save UI.
That callback was accidentally removed because it should not trigger the
negative listener, but the right approach was to pass a null listener.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
66235266
Fixes:
66944844
Change-Id: I5b71d3d03335d952e3b47078d1373f9783366437
Charles He [Tue, 26 Sep 2017 15:32:35 +0000 (15:32 +0000)]
Merge "StatusBar: add DISABLE2_SYSTEM_ICONS flag"
Evan Laird [Tue, 26 Sep 2017 14:25:16 +0000 (14:25 +0000)]
Merge "Fix wifi tile animating full-dark when slashing/unslashing" into oc-mr1-dev am:
9b120d5a08
am:
01cc377d88
Change-Id: I4cf6284c9d13167c707820564e93a7684ae1bf92
Evan Laird [Tue, 26 Sep 2017 14:14:31 +0000 (14:14 +0000)]
Merge "Fix wifi tile animating full-dark when slashing/unslashing" into oc-mr1-dev
am:
9b120d5a08
Change-Id: Ic1ff947868039b78360377e098d7908d7ca6eb42
Evan Laird [Tue, 26 Sep 2017 14:09:09 +0000 (14:09 +0000)]
Merge "Fix wifi tile animating full-dark when slashing/unslashing" into oc-mr1-dev
Bill Yi [Tue, 26 Sep 2017 13:58:36 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I348ab7ada9d98e745fe4716beadb6857d39705ec
Bill Yi [Tue, 26 Sep 2017 13:34:45 +0000 (06:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7ad28c099aa748fb73f42b1f90166171edaa38c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Tue, 26 Sep 2017 13:30:24 +0000 (13:30 +0000)]
Merge changes Ia47e566b,Ib94d79a9 am:
b9e2ddfc10 am:
a2161c5ccb am:
b91bd88c5e
am:
f43db3bf94
Change-Id: I4226f31aaea21a7ad2bff7ac8b0a85acc5151cfc
Jack Yu [Tue, 26 Sep 2017 13:19:16 +0000 (13:19 +0000)]
Merge "Fixed that telephony registry service reference incorrectly assigned" am:
b0510407da am:
aeb6820f11 am:
75c2378ea0
am:
1818704efb
Change-Id: I351ad10c34937741d5516229fcd02d7e286fc706
Nicolas Geoffray [Tue, 26 Sep 2017 13:13:34 +0000 (13:13 +0000)]
Merge "Move code around for deleting oat artifacts." am:
a7bf2a21d9 am:
69fbdcae71 am:
6518232039 -s ours
am:
4b8036f6ce
Change-Id: I3d47d3084b886cca0f0dbc6068b95f927c2fe2cc
Nicolas Geoffray [Tue, 26 Sep 2017 13:06:43 +0000 (13:06 +0000)]
Merge "Special handling of priv-apps in PMS." am:
107899c599 am:
15b0493360 am:
35455f2553
am:
61dc6ffcbd
Change-Id: I21e1683250d43cbc4c95ec748623b7368f8d4b28
Hugo Benichi [Tue, 26 Sep 2017 13:05:41 +0000 (13:05 +0000)]
Merge changes Ia47e566b,Ib94d79a9 am:
b9e2ddfc10 am:
a2161c5ccb
am:
b91bd88c5e
Change-Id: Ied2b31c9d1219b8aebf5fec085ab598b77bede6e
Hans Boehm [Tue, 26 Sep 2017 13:03:11 +0000 (13:03 +0000)]
Merge "Naming fix and add comments" am:
3c03d5bd2b am:
24b9851605 am:
4a901144fe
am:
c9532e8ac6
Change-Id: Ibe7d825b3b491cd9e5fb1ef07adaa9f71719e0dd
Jack Yu [Tue, 26 Sep 2017 13:02:10 +0000 (13:02 +0000)]
Merge "Fixed that telephony registry service reference incorrectly assigned" am:
b0510407da am:
aeb6820f11
am:
75c2378ea0
Change-Id: I80082688f4c7c3438ca4e6cdd5eb3cb80fbd4ad1
Nicolas Geoffray [Tue, 26 Sep 2017 12:58:30 +0000 (12:58 +0000)]
Merge "Move code around for deleting oat artifacts." am:
a7bf2a21d9 am:
69fbdcae71
am:
6518232039 -s ours
Change-Id: Id51866d5e0e0615db96bbf25a8171e95f664faab
Peng Xu [Tue, 26 Sep 2017 12:49:03 +0000 (12:49 +0000)]
Merge changes from topic "equalizer_1" am:
1ba697e29b am:
46f2249f46 am:
01ad27a0eb
am:
b855edc41f
Change-Id: I499360f6cb7ecdf5c8580faf066c9ac0c0aea59a
Peng Xu [Tue, 26 Sep 2017 12:47:35 +0000 (12:47 +0000)]
Add sensor HAL process into dump list am:
ee5164ef5b am:
2398607cc7 am:
3e18872796
am:
d4b37b57e0 -s ours
Change-Id: Ief93a5d4e69e4280eacc2d428393a2b56a4ef217
Nicolas Geoffray [Tue, 26 Sep 2017 12:46:30 +0000 (12:46 +0000)]
Merge "Special handling of priv-apps in PMS." am:
107899c599 am:
15b0493360
am:
35455f2553
Change-Id: I8bfe46aad8166d4d4b7346fe10f3e148a34ccf0b
Hugo Benichi [Tue, 26 Sep 2017 12:43:28 +0000 (12:43 +0000)]
Merge changes Ia47e566b,Ib94d79a9 am:
b9e2ddfc10
am:
a2161c5ccb
Change-Id: If1125419d50b8291bcb056dd4bc7ecd6ea2b5342
Hans Boehm [Tue, 26 Sep 2017 12:42:41 +0000 (12:42 +0000)]
Merge "Naming fix and add comments" am:
3c03d5bd2b am:
24b9851605
am:
4a901144fe
Change-Id: I1e2446f67e0505d30edb230f2dde70855c9fe00c
Peng Xu [Tue, 26 Sep 2017 12:40:36 +0000 (12:40 +0000)]
Merge changes from topic "equalizer" am:
aad139a2d3 -s ours am:
2c292120aa -s ours am:
228e5b94e3
am:
dd463873b1
Change-Id: I7e26c227b8323be39db30bd46b49e54ad3134073
Peng Xu [Tue, 26 Sep 2017 12:38:01 +0000 (12:38 +0000)]
Merge changes from topic "equalizer_1" am:
1ba697e29b am:
46f2249f46
am:
01ad27a0eb
Change-Id: Ie717da6b0e336701bdacc2949877bc0c1d71cb58
Peng Xu [Tue, 26 Sep 2017 12:36:50 +0000 (12:36 +0000)]
Add sensor HAL process into dump list am:
ee5164ef5b am:
2398607cc7
am:
3e18872796
Change-Id: I5028128bc23fa670dedd1c763f2227d30f40957e
Jack Yu [Tue, 26 Sep 2017 12:34:42 +0000 (12:34 +0000)]
Merge "Fixed that telephony registry service reference incorrectly assigned" am:
b0510407da
am:
aeb6820f11
Change-Id: Ie788700dfe65037d80fb1a42ff3dae1030b37405
Peng Xu [Tue, 26 Sep 2017 12:33:02 +0000 (12:33 +0000)]
Merge changes from topic "equalizer" am:
aad139a2d3 -s ours am:
2c292120aa -s ours
am:
228e5b94e3
Change-Id: I480f3645c89dbd44117f18a5807f8aea753439ab
Nicolas Geoffray [Tue, 26 Sep 2017 12:30:43 +0000 (12:30 +0000)]
Merge "Move code around for deleting oat artifacts." am:
a7bf2a21d9
am:
69fbdcae71
Change-Id: If5e92c3b0499f3d2f69975596678581dfc090733
Nicolas Geoffray [Tue, 26 Sep 2017 12:26:51 +0000 (12:26 +0000)]
Merge "Special handling of priv-apps in PMS." am:
107899c599
am:
15b0493360
Change-Id: I30c573bccf1f0e483d0881062c5b83a56b5080fe
Hans Boehm [Tue, 26 Sep 2017 12:23:12 +0000 (12:23 +0000)]
Merge "Naming fix and add comments" am:
3c03d5bd2b
am:
24b9851605
Change-Id: Ib2f4ade384b33efc5d54374ce13e26e256f4c8d3
Peng Xu [Tue, 26 Sep 2017 12:21:36 +0000 (12:21 +0000)]
Update Java doc of SensorManager.createDirectChannel am:
9ee042efa8 am:
1c2b555ad9 am:
1cc5ca6bdd -s ours
am:
a5392a56e5
Change-Id: Ida8af98146e50203211c34b068e1af0da48c03e8
Peng Xu [Tue, 26 Sep 2017 12:17:39 +0000 (12:17 +0000)]
Merge changes from topic "equalizer_1" am:
1ba697e29b
am:
46f2249f46
Change-Id: Icd3c715dfed772d05b8314a394aad2725a9937e0
Peng Xu [Tue, 26 Sep 2017 12:16:35 +0000 (12:16 +0000)]
Add sensor HAL process into dump list am:
ee5164ef5b
am:
2398607cc7
Change-Id: I625a84f4f5c235c06e90fe4f8b44aa41979c8b5b
Peng Xu [Tue, 26 Sep 2017 12:13:04 +0000 (12:13 +0000)]
Merge changes from topic "equalizer" am:
aad139a2d3 -s ours
am:
2c292120aa -s ours
Change-Id: I7d40f3964fd312fe645dba2b05cc324fea079321
Peng Xu [Tue, 26 Sep 2017 12:10:47 +0000 (12:10 +0000)]
Update Java doc of SensorManager.createDirectChannel am:
9ee042efa8 am:
1c2b555ad9
am:
1cc5ca6bdd -s ours
Change-Id: I7b4bb738cc70f03abc7ac464bb7e148ac6fde4a2
Peng Xu [Tue, 26 Sep 2017 11:56:01 +0000 (11:56 +0000)]
Update Java doc of SensorManager.createDirectChannel am:
9ee042efa8
am:
1c2b555ad9
Change-Id: If2ca73b4b7ba4c1e6778061739ce3689a1341746
Hugo Benichi [Tue, 26 Sep 2017 11:46:30 +0000 (11:46 +0000)]
Merge changes Ia47e566b,Ib94d79a9
am:
b9e2ddfc10
Change-Id: I0cac456f778db78d76d2225b79ce42526a6d2d19
Jack Yu [Tue, 26 Sep 2017 11:33:16 +0000 (11:33 +0000)]
Merge "Fixed that telephony registry service reference incorrectly assigned"
am:
b0510407da
Change-Id: I0d65bc2cc843ce49a10cf6fdebfc4e1f602edaea
Nicolas Geoffray [Tue, 26 Sep 2017 11:25:41 +0000 (11:25 +0000)]
Merge "Move code around for deleting oat artifacts."
am:
a7bf2a21d9
Change-Id: I63ef9f2a730dbe6ad37ce750be3a6a47636c14d6
Nicolas Geoffray [Tue, 26 Sep 2017 11:22:00 +0000 (11:22 +0000)]
Merge "Special handling of priv-apps in PMS."
am:
107899c599
Change-Id: I43de972b520dcfab7d103ce77ea1539e341825b3
Hans Boehm [Tue, 26 Sep 2017 11:12:19 +0000 (11:12 +0000)]
Merge "Naming fix and add comments"
am:
3c03d5bd2b
Change-Id: Ib35c874f56f87757904553ceeffb4d363eff196e
Peng Xu [Tue, 26 Sep 2017 11:07:28 +0000 (11:07 +0000)]
Merge changes from topic "equalizer_1"
am:
1ba697e29b
Change-Id: I0b5dabe42c0ab59fab63ea653392dd4d99b7d967
Peng Xu [Tue, 26 Sep 2017 11:05:54 +0000 (11:05 +0000)]
Add sensor HAL process into dump list
am:
ee5164ef5b
Change-Id: I2d13c8d5a871e00cbe96d42b2f8779f5d323223f
Peng Xu [Tue, 26 Sep 2017 11:01:14 +0000 (11:01 +0000)]
Merge changes from topic "equalizer"
am:
aad139a2d3 -s ours
Change-Id: Id283ea5e7ad3620f9c6488aadcca8bb216aea482
Bill Yi [Tue, 26 Sep 2017 10:43:41 +0000 (03:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib46c9f6f5ca5428304740a8505688be5c9b73b5a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Charles He [Tue, 26 Sep 2017 09:45:25 +0000 (10:45 +0100)]
AM: fix bug in moveTaskToBackLocked due to LockTask
In the previous refactor of LockTask-related methods, there was a typo
which resulted in an incorrect lock task state being reported during
moveTaskToBackLocked.
Bug:
66224859
Test: cts/tests/framework/base/activitymanager/util/run-test CtsActivityManagerDeviceTestCases android.server.am.ActivityManagerPinnedStackTests
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Change-Id: Ic235069ed3c2bafb14efcd83b98af12e37fcb5a7
Hugo Benichi [Tue, 26 Sep 2017 09:48:10 +0000 (09:48 +0000)]
Merge changes Ia47e566b,Ib94d79a9
* changes:
Separate connectivity event buffer for bug reports
Extract RingBuffer class from NetdEventListenerService
Bill Yi [Tue, 26 Sep 2017 05:29:40 +0000 (22:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3bce312584c61d6bc31d4e7c4068b757336fbe25
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Fri, 15 Sep 2017 05:18:57 +0000 (14:18 +0900)]
Separate connectivity event buffer for bug reports
This patch uses the RingBuffer class previously extracted out of
NetdEventListenerService for buffering connectivity events in two
independent buffers:
- the current existing buffer used for metrics reporting
- a new rolling buffer, used for bug report dumpsys.
This improves the suefulness of connectivity metrics for bug reports
by solving these three issues tied to the usage of the existing metrics
reporting buffer:
- the buffer is always cleared when metrics reporting happens. If a bug
report is taken shortly after, there is no past connectivity event
added to that bug report.
- the buffer has a max capacity and starts dropping new events when it
saturates, until metrics reporting happens. When this happens, a bug
report will not contain recent connectivity events.
- some types of event are rate limited to avoid flooding the metrics
buffer. events dropped due to rate limits never appears in the bug
report, but the new bug report buffer ignores rate limiting.
Bug:
65164242
Bug:
65700460
Test: runtest frameworks-net,
manually inspecting ouput of $ adb shell dumpsys connmetrics -a
Change-Id: Ia47e566b0c9a6629a26afb7067d5a8efadc25aef
Hugo Benichi [Thu, 14 Sep 2017 07:31:38 +0000 (16:31 +0900)]
Extract RingBuffer class from NetdEventListenerService
This patch takes out the ring buffer array added for NFLOG wakeup packet
events logging and extract it into its own class for reuse. This new
RingBuffer class has the two minimal useful functions append() and
toArray().
Bug:
65164242
Bug:
65700460
Test: runtest frameworks-net, with new unit test
Change-Id: Ib94d79a93f4e99661b7d0fac67117b91d57af980
Adam Lesinski [Mon, 25 Sep 2017 20:10:14 +0000 (13:10 -0700)]
A few fixes to AssetManager2 for compat
Theme copying should behave the way it did with the old AssetManager
(copy only the framework attributes when copying from a Theme object
from a different AssetManager).
Cleanup the dependencies on libziparchive in ApkAssets.
Test: make libandroidfw_tests
Test: out/host/<platform>/nativetests64/libandroidfw_tests/libandroidfw_tests --testdata=frameworks/base/libs/androidfw/tests/data
Change-Id: I973f7e6eb14ce311306e2ec66a623a4790c8d233
Braden Kell [Tue, 26 Sep 2017 00:30:28 +0000 (17:30 -0700)]
Pass saved parameters to boot action
Bug: http://b/
65462981
Test: Parameters in next_boot.json are passed to
boot action; next_boot.json is moved to
last_boot.json to allow reading by
DeviceManagementService.
Change-Id: Ie290711ea48a3a221cfad2e9266215b76631ecbd
Bryce Lee [Tue, 26 Sep 2017 00:28:52 +0000 (00:28 +0000)]
Merge "Restrict when a window receives new Configurations." into oc-mr1-dev am:
d71227355e
am:
9626a900da
Change-Id: If2664499c9f4233fbbdea7b488fed761d6faf1c1
Bryce Lee [Tue, 26 Sep 2017 00:18:41 +0000 (00:18 +0000)]
Merge "Restrict when a window receives new Configurations." into oc-mr1-dev
am:
d71227355e
Change-Id: Ibc6aea6b9126639a44b36466a2efcfbe0dd8d267
Bryce Lee [Tue, 26 Sep 2017 00:12:15 +0000 (00:12 +0000)]
Merge "Restrict when a window receives new Configurations." into oc-mr1-dev
OSDN Git Service
