OSDN Git Service
John Reck [Wed, 27 Sep 2017 19:50:07 +0000 (19:50 +0000)]
Merge "Add nullptr check" into oc-mr1-dev
am:
b20694ab00
Change-Id: I090a1d0a4f0b2b5ec8c599d795995ea242c2a6ca
John Reck [Wed, 27 Sep 2017 19:43:29 +0000 (19:43 +0000)]
Merge "Add nullptr check" into oc-mr1-dev
Winson Chung [Wed, 27 Sep 2017 19:41:39 +0000 (19:41 +0000)]
Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev
am:
1ca7d06313
Change-Id: Ifd9843a433cadc7d0effa6783455e933ca5d2575
Winson Chung [Wed, 27 Sep 2017 19:34:45 +0000 (19:34 +0000)]
Merge "Minimal change to ensure that position is last saved when docking." into oc-mr1-dev
Winson Chung [Tue, 26 Sep 2017 18:51:08 +0000 (11:51 -0700)]
Minimal change to ensure that position is last saved when docking.
- When a task is docked from Recents, the last position is never updated
if the user never touches the divider. Ensure that the default dock
snap target is saved in this case as well.
Bug:
66903645
Test: Dock a task from Recents, go home, and hit recents
Change-Id: Ia229d2ba0eee792424fb9e9c043320cec71695dc
John Reck [Wed, 27 Sep 2017 16:30:30 +0000 (09:30 -0700)]
Add nullptr check
Bug:
65717856
Test: builds
Change-Id: I188d3366e956f087c6317ae0b56d5fb19a20708d
Abodunrinwa Toki [Wed, 27 Sep 2017 14:17:57 +0000 (14:17 +0000)]
Fix crash due to TextView.getText() returning null.
am:
8f22de0e7f
Change-Id: I0166041823ff6467762df45efd66bfa7d0be5bff
Abodunrinwa Toki [Wed, 20 Sep 2017 21:10:22 +0000 (22:10 +0100)]
Fix crash due to TextView.getText() returning null.
This CL ensures that a null text is not passed to
TextClassificationHelper.reset(...)
This CL does not handle the issue of TextView.getText() being null.
Bug:
65682674
Test: none
Merged-In: Id8bdc062ecf21cc14810586580fef9052672cfd8
Change-Id: Id8bdc062ecf21cc14810586580fef9052672cfd8
Lorenzo Colitti [Wed, 27 Sep 2017 11:20:50 +0000 (11:20 +0000)]
Declare support for Ethernet if the service is running.
am:
8fa085e76f
Change-Id: I5df25cfc5e5dfe5b04f206842b284011d0d4f8d5
Lorenzo Colitti [Wed, 27 Sep 2017 11:05:29 +0000 (11:05 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload." am:
d1ae268081 am:
53eb9d359a
am:
bb21618a86
Change-Id: I07d9753e214af311d3dcab6f8016442f60388700
Lorenzo Colitti [Wed, 27 Sep 2017 10:59:13 +0000 (10:59 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload." am:
d1ae268081
am:
53eb9d359a
Change-Id: If4b3dcf4c1bf03a1d105ad4dfdd007fa371f4472
Jean Chalard [Wed, 27 Sep 2017 10:54:58 +0000 (10:54 +0000)]
Merge "Adds necessary permissions to system apis" am:
b4a5933a62 am:
f3b169c8e6
am:
19fc73f8dc -s ours
Change-Id: If082278ab91e01852155afc1748474a937d7faae
Lorenzo Colitti [Wed, 27 Sep 2017 10:53:05 +0000 (10:53 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload."
am:
d1ae268081
Change-Id: I060bd7632b809d89224d250c697ac9d2e89d5c2d
Lorenzo Colitti [Wed, 27 Sep 2017 10:46:36 +0000 (10:46 +0000)]
Merge "Delete the legacy framework code for manipulating ND offload."
Jean Chalard [Wed, 27 Sep 2017 10:06:52 +0000 (10:06 +0000)]
Merge "Adds necessary permissions to system apis" am:
b4a5933a62
am:
f3b169c8e6
Change-Id: If10e10963cedfe4b19e57d3b26a6c4113985757f
Jean Chalard [Wed, 27 Sep 2017 09:58:51 +0000 (09:58 +0000)]
Merge "Adds necessary permissions to system apis"
am:
b4a5933a62
Change-Id: Ifa5d94cdd883c3e1b983c985c0c17fe61e864352
Jean Chalard [Wed, 27 Sep 2017 09:50:42 +0000 (09:50 +0000)]
Merge "Adds necessary permissions to system apis"
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 [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.
(cherry picked from commit
7bbe3eee52c08ee92a81b7bed395ca5499554cc4)
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: I9b6db4edeaf966ee6715011dd92770b9d25dd938
Merged-In: I9b6db4edeaf966ee6715011dd92770b9d25dd938
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 [Wed, 27 Sep 2017 04:17:47 +0000 (13:17 +0900)]
Delete the legacy framework code for manipulating ND offload.
This only worked on broadcom devices, and was superseded in
M by a wifi HAL call made by IpManager.
Test: bullhead builds, boots
Change-Id: I711cae7dafe171c2c8b4e84a229adbcad27f3d14
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
Udam Saini [Wed, 7 Jun 2017 19:06:28 +0000 (12:06 -0700)]
Adds necessary permissions to system apis
adds privileged permission for getCaptivePortalServerUrl
adds tether privileged permission for
startTethering,isTetheringSupported
bug:
62348162
Test: make and manual testing
Change-Id: I8eb8e3c9dcd7201abe9ea303ee57fe99073d67eb
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
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:22:06 +0000 (01:22 +0000)]
Merge "Fix spelling mistake in dumpsys output" into oc-mr1-dev
am:
1198bec925
Change-Id: I21837cdcdc44c8bc8496ed699b3e8420534fd9c4
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: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
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
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
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: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
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
TreeHugger Robot [Tue, 26 Sep 2017 22:48:42 +0000 (22:48 +0000)]
Merge "Shorter notification text on AoD" into oc-mr1-dev
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 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
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
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: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: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:30:28 +0000 (19:30 +0000)]
Merge "Add null check in a11y callback" into oc-mr1-dev
am:
4dfeb4f0e4
Change-Id: Ibadc5f3fa1b2cd67998215a132f73bde7f1f4511
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
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
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
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
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
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
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
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
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
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
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
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: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:17:39 +0000 (12:17 +0000)]
Merge changes from topic "equalizer_1" am:
1ba697e29b
am:
46f2249f46
Change-Id: Icd3c715dfed772d05b8314a394aad2725a9937e0
OSDN Git Service
