OSDN Git Service
Lorenzo Colitti [Wed, 27 Sep 2017 09:08:08 +0000 (09:08 +0000)]
Merge "Declare support for Ethernet if the service is running." am:
0d3d35b30b am:
5ada8e56f8 am:
a6648cc90b
am:
85aa652492
Change-Id: I38791cf8b26a49dd8bd210ea3e0284dece9f0719
Lorenzo Colitti [Wed, 27 Sep 2017 08:51:51 +0000 (08:51 +0000)]
Merge "Declare support for Ethernet if the service is running." am:
0d3d35b30b am:
5ada8e56f8
am:
a6648cc90b
Change-Id: Iafd9807ab76ce4e4ab1fd506d7b0e2b2b7017751
Lorenzo Colitti [Wed, 27 Sep 2017 08:40:53 +0000 (08:40 +0000)]
Merge "Declare support for Ethernet if the service is running." am:
0d3d35b30b
am:
5ada8e56f8
Change-Id: I8cbd09623b419f14a52f722740580c6ae6de7613
Lorenzo Colitti [Wed, 27 Sep 2017 08:32:43 +0000 (08:32 +0000)]
Merge "Declare support for Ethernet if the service is running."
am:
0d3d35b30b
Change-Id: Ie0a0190da53571c6f4b466840b7878eb54b5e136
Treehugger Robot [Wed, 27 Sep 2017 08:23:34 +0000 (08:23 +0000)]
Merge "Declare support for Ethernet if the service is running."
Lorenzo Colitti [Thu, 24 Aug 2017 13:35:10 +0000 (22:35 +0900)]
Declare support for Ethernet if the service is running.
On some devices, support for TYPE_ETHERNET is not specified in
the networkAttributes config resource, even though the device is
capable of supporting Ethernet (e.g., via USB host adapters).
This leads to Ethernet working but various connectivity APIs
behaving as if it was not - for example, no CONNECTIVITY_ACTION
broadcasts will be issues when it connects or disconnects.
Ensure that ConnectivityService always treats Ethernet as
available if the service is running. Currently the service is
started if the device supports FEATURE_ETHERNET or
FEATURE_USB_HOST.
Bug:
37359230
Test: bullhead builds, boots
Test: ConnectivityServiceTest passes
Test: Ethernet is available even if removed from networkAttributes resource
Test: ConnectivityManagerTest CTS test passes
Change-Id: I58801bf4f0bbdc3ff6345ec6bfdc911ce045c8ab
TreeHugger Robot [Wed, 27 Sep 2017 03:25:24 +0000 (03:25 +0000)]
Merge "cpp: use proper nativehelper headers"
TreeHugger Robot [Wed, 27 Sep 2017 02:57:40 +0000 (02:57 +0000)]
Merge "Extract tag ID from log_msg and fill in stats log proto Test: tested locally"
Kevin Chyn [Wed, 27 Sep 2017 02:56:10 +0000 (02:56 +0000)]
Merge "Add metrics constant for fingerprint authenticate sidecar"
Chalard Jean [Wed, 27 Sep 2017 02:21:11 +0000 (02:21 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission" into oc-mr1-dev am:
e545f00e10
am:
47cfcef09c
Change-Id: I9eb78b72bdf043e4917f6d0d7495b65cfa1114db
Chalard Jean [Wed, 27 Sep 2017 02:12:24 +0000 (02:12 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission" into oc-mr1-dev
am:
e545f00e10
Change-Id: Ib5b17a7f68c1327f47fe1f54c0454c51f4226907
Sharad Sangle [Wed, 27 Sep 2017 02:08:17 +0000 (02:08 +0000)]
Merge "AudioService: Don't honour SCO ON request if SCO is not connected" into oc-mr1-dev am:
44eac965d5
am:
eb1e7bc82c
Change-Id: Id83b7194e848b00707d633b5e2a6c069e9c25a8a
Chalard Jean [Wed, 27 Sep 2017 02:04:33 +0000 (02:04 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission" into oc-mr1-dev
Sharad Sangle [Wed, 27 Sep 2017 01:59:25 +0000 (01:59 +0000)]
Merge "AudioService: Don't honour SCO ON request if SCO is not connected" into oc-mr1-dev
am:
44eac965d5
Change-Id: I98cb618fdba2f1aa92fb8130d7caf075711d6cb9
TreeHugger Robot [Wed, 27 Sep 2017 01:52:54 +0000 (01:52 +0000)]
Merge "AudioService: Don't honour SCO ON request if SCO is not connected" into oc-mr1-dev
Calin Juravle [Wed, 27 Sep 2017 01:30:08 +0000 (01:30 +0000)]
Merge "Fix spelling mistake in dumpsys output" into oc-mr1-dev am:
1198bec925
am:
b22e7a2efd
Change-Id: I8a1019d737bf543c47473f91c97816918aa21ea7
Calin Juravle [Wed, 27 Sep 2017 01:22:06 +0000 (01:22 +0000)]
Merge "Fix spelling mistake in dumpsys output" into oc-mr1-dev
am:
1198bec925
Change-Id: I21837cdcdc44c8bc8496ed699b3e8420534fd9c4
yro [Sun, 24 Sep 2017 01:01:01 +0000 (18:01 -0700)]
Extract tag ID from log_msg and fill in stats log proto
Test: tested locally
Change-Id: Ic6b88995dc9eec367125d687e4af9277016a30cb
TreeHugger Robot [Wed, 27 Sep 2017 01:14:35 +0000 (01:14 +0000)]
Merge "Fix spelling mistake in dumpsys output" into oc-mr1-dev
Fyodor Kupolov [Wed, 27 Sep 2017 00:58:56 +0000 (00:58 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak" am:
bff14ae56f -s ours am:
602aa57cb9 -s ours am:
6790df9a90
am:
ebff6df06f -s ours
Change-Id: Iffc1d8d600abcd161f715f74de7ba74cf8bdd616
Fyodor Kupolov [Wed, 27 Sep 2017 00:53:21 +0000 (00:53 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak" am:
bff14ae56f -s ours am:
602aa57cb9 -s ours
am:
6790df9a90
Change-Id: I0a579c43358eda1ef9e924bff52af12412f17568
TreeHugger Robot [Wed, 27 Sep 2017 00:53:15 +0000 (00:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Fyodor Kupolov [Wed, 27 Sep 2017 00:46:29 +0000 (00:46 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak" am:
bff14ae56f -s ours
am:
602aa57cb9 -s ours
Change-Id: I62c9c5e8edec52feb8bbd680a2206feda172e133
Fyodor Kupolov [Wed, 27 Sep 2017 00:34:37 +0000 (00:34 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak"
am:
bff14ae56f -s ours
Change-Id: I4737fa1dd54600f276ce90d3a04dbbd7cebe7f54
Calin Juravle [Wed, 27 Sep 2017 00:30:02 +0000 (00:30 +0000)]
Merge "Remove obsolete & broken handling of precompiled sys apps" into oc-mr1-dev am:
3e00e3bd92
am:
2f8eb6cb00 -s ours
Change-Id: I547d02c8fccca50df6ea7e8556da3b7dbf1df451
Fyodor Kupolov [Wed, 27 Sep 2017 00:25:16 +0000 (00:25 +0000)]
Merge "[DO NOT MERGE] Fix another AddAccountSettings memory leak"
Calin Juravle [Wed, 27 Sep 2017 00:20:00 +0000 (00:20 +0000)]
Merge "Remove obsolete & broken handling of precompiled sys apps" into oc-mr1-dev
am:
3e00e3bd92
Change-Id: Id5a92c8f49d07896327cba7c63f06392026909d9
TreeHugger Robot [Wed, 27 Sep 2017 00:13:22 +0000 (00:13 +0000)]
Merge "Remove obsolete & broken handling of precompiled sys apps" into oc-mr1-dev
TreeHugger Robot [Wed, 27 Sep 2017 00:09:13 +0000 (00:09 +0000)]
Merge "Fix another AddAccountSettings memory leak"
Felipe Leme [Tue, 26 Sep 2017 23:51:48 +0000 (23:51 +0000)]
Merge "Added missing quote (") on anchor tag." into oc-mr1-dev am:
7c112b733c
am:
33b907f6b0
Change-Id: I0e4382cdda9d5be28542d8cb8a4762b5b5513e0c
TreeHugger Robot [Tue, 26 Sep 2017 23:47:07 +0000 (23:47 +0000)]
Merge "Delay bootanimation exit until told to shutdown."
Felipe Leme [Tue, 26 Sep 2017 23:42:37 +0000 (23:42 +0000)]
Merge "Added missing quote (") on anchor tag." into oc-mr1-dev
am:
7c112b733c
Change-Id: I1f51b9217766be19c83001f052bc6f698b050ca9
Felipe Leme [Tue, 26 Sep 2017 23:35:41 +0000 (23:35 +0000)]
Merge "Added missing quote (") on anchor tag." into oc-mr1-dev
Beverly [Tue, 26 Sep 2017 23:31:06 +0000 (23:31 +0000)]
Merge "Adjusted chooser padding so 2nd line isn't cutoff." into oc-mr1-dev am:
5802026595
am:
3836cce06d
Change-Id: Ia03d3752e15bc7700abecc2dff0d0c1b8a6acdd9
Julia Reynolds [Tue, 26 Sep 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Don't convert all sounds to vibrations in vibrate mode" into oc-mr1-dev am:
169f367125
am:
1ed40b4296
Change-Id: I4594c684ac9b290f896dc00961bb7e5339e747e8
Kevin Chyn [Tue, 26 Sep 2017 23:21:05 +0000 (23:21 +0000)]
Merge "Keyguard should updateFingerprintListeningState when goingAway changes"
Kevin Chyn [Tue, 26 Sep 2017 23:03:05 +0000 (16:03 -0700)]
Add metrics constant for fingerprint authenticate sidecar
Bug:
63907591
Test: manual
Change-Id: I0d039a1886cce10b67dc7215cba38dc1d8ce35a5
Beverly [Tue, 26 Sep 2017 23:20:09 +0000 (23:20 +0000)]
Merge "Adjusted chooser padding so 2nd line isn't cutoff." into oc-mr1-dev
am:
5802026595
Change-Id: Ic2bb95c7230ea25646824f41d219b09d3cb70709
TreeHugger Robot [Tue, 26 Sep 2017 23:14:08 +0000 (23:14 +0000)]
Merge "Adjusted chooser padding so 2nd line isn't cutoff." into oc-mr1-dev
Julia Reynolds [Tue, 26 Sep 2017 23:11:38 +0000 (23:11 +0000)]
Merge "Don't convert all sounds to vibrations in vibrate mode" into oc-mr1-dev
am:
169f367125
Change-Id: Iaa1818e4d04f913c15da06a8dbbc5993d0e0a7e0
Lucas Dupin [Tue, 26 Sep 2017 23:05:27 +0000 (23:05 +0000)]
Merge "Shorter notification text on AoD" into oc-mr1-dev am:
371ed39c93
am:
a8a75999b9
Change-Id: I6498ccf96fdf3480d14ac9bb671084ed4d0f27d1
TreeHugger Robot [Tue, 26 Sep 2017 23:04:24 +0000 (23:04 +0000)]
Merge "Don't convert all sounds to vibrations in vibrate mode" into oc-mr1-dev
Lucas Dupin [Tue, 26 Sep 2017 22:54:31 +0000 (22:54 +0000)]
Merge "Shorter notification text on AoD" into oc-mr1-dev
am:
371ed39c93
Change-Id: I1d719ba5224081712ce4463215cfdcc980ed7749
nharold [Tue, 26 Sep 2017 22:49:36 +0000 (22:49 +0000)]
Merge changes from topic "re-enable-ipsec" am:
680525c742 am:
8d306cd78a am:
80107540bb
am:
80b90ed99a
Change-Id: Idffe4296539c6f0db00ce3ec2e5241224ece39b4
TreeHugger Robot [Tue, 26 Sep 2017 22:48:42 +0000 (22:48 +0000)]
Merge "Shorter notification text on AoD" into oc-mr1-dev
Nathan Harold [Tue, 26 Sep 2017 22:48:25 +0000 (22:48 +0000)]
Re-Enable Starting of the IpSecService am:
b72821747c am:
f434a6d308 am:
686a8282bb
am:
458b8cd302
Change-Id: Ic492c58b8c9b56f870c99336e82fd8d05c9e8969
nharold [Tue, 26 Sep 2017 22:39:01 +0000 (22:39 +0000)]
Merge changes from topic "re-enable-ipsec" am:
680525c742 am:
8d306cd78a
am:
80107540bb
Change-Id: I13a7134864a648aff9338fda044b3bffd653119e
Nathan Harold [Tue, 26 Sep 2017 22:37:44 +0000 (22:37 +0000)]
Re-Enable Starting of the IpSecService am:
b72821747c am:
f434a6d308
am:
686a8282bb
Change-Id: Ia24348d585b2f1050dafd161eafcdadf0edd82c0
nharold [Tue, 26 Sep 2017 22:24:02 +0000 (22:24 +0000)]
Merge changes from topic "re-enable-ipsec" am:
680525c742
am:
8d306cd78a
Change-Id: I4e712a0d17618ca93cf6032b59ce8be0c8e0bfee
Nathan Harold [Tue, 26 Sep 2017 22:22:42 +0000 (22:22 +0000)]
Re-Enable Starting of the IpSecService am:
b72821747c
am:
f434a6d308
Change-Id: I328841b57df6f216c0e4b0aa0c1df923c606a885
tiansiming [Wed, 20 Sep 2017 05:59:13 +0000 (13:59 +0800)]
[DO NOT MERGE] Fix another AddAccountSettings memory leak
The memory leak will always occur in AddAccoutSettings
when Bundle with an invalid intent returned in the addAccount we implement.
Bug:https://issuetracker.google.com/issues/
66088681
Test:Install the app through the github offered in above link,
then press the "Test" item in ChooseAccountActivity (adb shell am start -n
'com.android.settings/.accounts.ChooseAccountActivity') serveal times.
Check the activity number by "adb shell dumpsys meminfo com.android.settings".
Change-Id: Id15fc73521d0ddc6ca891b6029ad04cd4427dbfe
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
nharold [Tue, 26 Sep 2017 22:13:20 +0000 (22:13 +0000)]
Merge changes from topic "re-enable-ipsec"
am:
680525c742
Change-Id: Ia1d1f3981a9dd1eb8f60631d318211daf135d575
Nathan Harold [Tue, 26 Sep 2017 22:11:58 +0000 (22:11 +0000)]
Re-Enable Starting of the IpSecService
am:
b72821747c
Change-Id: I1f64aa2fdf1cce6dea91427eda65c4b8ee6f6b02
Doris Liu [Tue, 26 Sep 2017 22:01:04 +0000 (22:01 +0000)]
Merge "Fix crash when creating a HW Bitmap on a detached view" into oc-mr1-dev am:
701bb5b754
am:
e87caf2e92
Change-Id: I3e87ad8958ce0a696593f0d771c492634f6703d4
Doris Liu [Tue, 26 Sep 2017 21:53:41 +0000 (21:53 +0000)]
Merge "Fix crash when creating a HW Bitmap on a detached view" into oc-mr1-dev
am:
701bb5b754
Change-Id: Ie19e9de91eb3152eff0d92af573e95d1801d939a
Doris Liu [Tue, 26 Sep 2017 21:46:42 +0000 (21:46 +0000)]
Merge "Fix crash when creating a HW Bitmap on a detached view" into oc-mr1-dev
nharold [Tue, 26 Sep 2017 21:46:39 +0000 (21:46 +0000)]
Merge changes from topic "re-enable-ipsec"
* changes:
Re-Expose IpSecService API Surface
Re-Enable Starting of the IpSecService
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
(cherry picked from commit
efc022768eba2f33d3fadbda7eaa6adf1730d3fc)
Merged-In: I981e463d61c42ab8455d489ff86cc300632a2a90
Change-Id: I981e463d61c42ab8455d489ff86cc300632a2a90
TreeHugger Robot [Tue, 26 Sep 2017 21:35:08 +0000 (21:35 +0000)]
Merge "Fixing log tags in some NotificationSignalExtractors."
Ed Coyne [Tue, 26 Sep 2017 20:19:04 +0000 (13:19 -0700)]
Delay bootanimation exit until told to shutdown.
We delay shutting down the animation if there is a boot action present
until we are told by the system to shutdown.
This addresses an issue we are seeing where we switched to a very short
bootanimation (bootanimation_mini.zip) to save CPU but this kills the
boot action prematurely.
Bug:
37992717
Test: Ran locally against imx7d.
Change-Id: I23556b21128b80d08cc55eaa761439a570b8eebe
TreeHugger Robot [Tue, 26 Sep 2017 21:26:53 +0000 (21:26 +0000)]
Merge "Remove obsolete & broken handling of precompiled sys apps"
Bill Yi [Tue, 26 Sep 2017 21:15:23 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a8fac2dc706f8ee426e572677f91a0846d78bcd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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
Calin Juravle [Tue, 26 Sep 2017 20:23:00 +0000 (13:23 -0700)]
Fix spelling mistake in dumpsys output
Bug:
65843255
Test: build
Change-Id: Icc748dd14b52641e37b149f51d61a4086e55ed41
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 20:05:36 +0000 (13:05 -0700)]
Added missing quote (") on anchor tag.
Test: 'm -j doc-comment-check-docs' then verify resulting HTML
Fixes:
66958057
Change-Id: Ie5914a5af191866404b6fbf244c78e145c59a8b1
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
Kweku Adams [Tue, 26 Sep 2017 01:15:58 +0000 (18:15 -0700)]
Fixing log tags in some NotificationSignalExtractors.
Test: it builds
Change-Id: Ie3580c2db3e8b26e408958cc6017bed45a591bbd
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
Lucas Dupin [Mon, 25 Sep 2017 22:41:23 +0000 (15:41 -0700)]
Shorter notification text on AoD
Change-Id: I961c7348d6ce2389c9ac0fba980237548eaf26c9
Fixes:
66242485
Test: Send notification with big text, look at AoD
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"
OSDN Git Service
