OSDN Git Service
Christine Franks [Wed, 20 Feb 2019 17:01:55 +0000 (17:01 +0000)]
Merge "Remove ColorDisplayController"
Sam Lin [Wed, 20 Feb 2019 16:52:38 +0000 (16:52 +0000)]
Merge "Disables display content scaling for foldables"
Android Build Merger (Role) [Wed, 20 Feb 2019 16:41:14 +0000 (16:41 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
85288a5e3c -s ours am:
54d5947793 -s ours am skip reason: subject contains skip directive"
TreeHugger Robot [Wed, 20 Feb 2019 16:40:21 +0000 (16:40 +0000)]
Merge "Move TextClassifier.getLocalTextClassifier() API."
Bill Yi [Wed, 20 Feb 2019 16:40:18 +0000 (08:40 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
85288a5e3c -s ours
am:
54d5947793 -s ours
am skip reason: subject contains skip directive
Change-Id: I8e524ba33fe382b607d9cb40e0cb66c6054b35b0
Bill Yi [Wed, 20 Feb 2019 16:35:59 +0000 (08:35 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85288a5e3c -s ours
am skip reason: subject contains skip directive
Change-Id: Iec829f315ae6c99cf4ab5b9f1f6e68b5d8f39a3f
Bill Yi [Wed, 20 Feb 2019 16:35:35 +0000 (08:35 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
e937b2703e -s ours
am:
0f70b8c4f7 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d29e0bd50a1cade1644abb8f736af7210e13307
Bill Yi [Wed, 20 Feb 2019 16:34:08 +0000 (08:34 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
93f661ab3b -s ours
am:
5556496511 -s ours
am skip reason: subject contains skip directive
Change-Id: Ica98dad1198d21d4205e0c928c0e077d5969c67f
Dario Freni [Wed, 20 Feb 2019 16:30:59 +0000 (16:30 +0000)]
Merge "Support split APKs in staged installs."
Bill Yi [Wed, 20 Feb 2019 16:29:00 +0000 (08:29 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e937b2703e -s ours
am skip reason: subject contains skip directive
Change-Id: Ic06d9c19e9213965262889d5b7f56b84751e9592
Bill Yi [Wed, 20 Feb 2019 16:27:16 +0000 (08:27 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
93f661ab3b -s ours
am skip reason: subject contains skip directive
Change-Id: I7305d8553060fc8b48ff33bb717c579e353fbaea
TreeHugger Robot [Wed, 20 Feb 2019 16:25:17 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:20:24 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:14:10 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jeff Sharkey [Wed, 20 Feb 2019 16:13:23 +0000 (16:13 +0000)]
Merge "Temporarily grant legacy storage to certain apps."
Andreas Gampe [Wed, 20 Feb 2019 15:54:27 +0000 (15:54 +0000)]
Merge "Services: Add more PMS presubmits"
TreeHugger Robot [Wed, 20 Feb 2019 15:51:59 +0000 (15:51 +0000)]
Merge "Changes on the ContentCaptureContext APIs."
TreeHugger Robot [Wed, 20 Feb 2019 15:51:52 +0000 (15:51 +0000)]
Merge "Don't lock WM when calling ActivityStackSupervisor.resolveIntent()"
Android Build Merger (Role) [Wed, 20 Feb 2019 15:31:59 +0000 (15:31 +0000)]
Merge "[automerger skipped] Merge "Use sampled value in hidden api logger" am:
619ed85e81 am:
818e8c1bf2 am:
98b52faf43 -s ours am skip reason: change_id I707a2624a254a80391cdae277dd59daa503d055f with SHA1
31bde16393 is in history"
Andrei-Valentin Onea [Wed, 20 Feb 2019 15:30:08 +0000 (07:30 -0800)]
[automerger skipped] Merge "Use sampled value in hidden api logger" am:
619ed85e81 am:
818e8c1bf2
am:
98b52faf43 -s ours
am skip reason: change_id I707a2624a254a80391cdae277dd59daa503d055f with SHA1
31bde16393 is in history
Change-Id: I8aacdc0e9c6c579941c4e3a56211800464dbbda7
TreeHugger Robot [Wed, 20 Feb 2019 15:22:58 +0000 (15:22 +0000)]
Merge "Add API comment for new API in WallpaperService."
Andrei-Valentin Onea [Wed, 20 Feb 2019 15:15:07 +0000 (07:15 -0800)]
Merge "Use sampled value in hidden api logger" am:
619ed85e81
am:
818e8c1bf2
Change-Id: I2cb5ac6bfae6cc98398688a4b5695260a863578a
Ioannis Ilkos [Wed, 20 Feb 2019 15:13:09 +0000 (15:13 +0000)]
Merge "Add tracepoints for process starts"
Andrei-Valentin Onea [Wed, 20 Feb 2019 15:04:44 +0000 (07:04 -0800)]
Merge "Use sampled value in hidden api logger"
am:
619ed85e81
Change-Id: Ib6ff5b5aa75d1b35bf91748f260bab14aa6eabab
Alan Viverette [Wed, 20 Feb 2019 14:59:12 +0000 (14:59 +0000)]
Merge "Public API for statically accessing global list of window views"
Martijn Coenen [Wed, 20 Feb 2019 14:49:11 +0000 (14:49 +0000)]
Merge "Kill app zygote when package is removed."
Andrei-Valentin Onea [Wed, 20 Feb 2019 14:49:10 +0000 (14:49 +0000)]
Merge "Use sampled value in hidden api logger"
TreeHugger Robot [Wed, 20 Feb 2019 14:37:26 +0000 (14:37 +0000)]
Merge "MediaProjection: Update permissions dialog."
Dario Freni [Wed, 20 Feb 2019 14:09:36 +0000 (14:09 +0000)]
Support split APKs in staged installs.
Fix:
123629153
Bug:
124807191
Test: installed a mainline module containing one base apk plus two
splits.
Change-Id: I8f6707370188fff9407dd00ff5d90bb83937657e
Fabian Kozynski [Wed, 20 Feb 2019 14:01:53 +0000 (14:01 +0000)]
Merge "Fix Adjustment for API review"
Adrian Roos [Wed, 20 Feb 2019 13:32:38 +0000 (05:32 -0800)]
Merge "Fix potential memory leak in SomeArgs" am:
8a71e01423 am:
17f5ae9e26
am:
381584a50b
Change-Id: Ie3a6c96582636da189b89df866357a34b96c5a55
Adrian Roos [Wed, 20 Feb 2019 13:18:06 +0000 (05:18 -0800)]
Merge "Fix potential memory leak in SomeArgs" am:
8a71e01423
am:
17f5ae9e26
Change-Id: I3e8c2c3f2e6cf0e119b1c6dcc1249096ea538e8c
TreeHugger Robot [Wed, 20 Feb 2019 13:17:34 +0000 (13:17 +0000)]
Merge "Fix inconsistent getPackageInfo() calls when parsing exceptions."
Adrian Roos [Wed, 20 Feb 2019 13:03:59 +0000 (05:03 -0800)]
Merge "Fix potential memory leak in SomeArgs"
am:
8a71e01423
Change-Id: I007ff55f39a3239c530c30306409b498ac066801
TreeHugger Robot [Wed, 20 Feb 2019 13:00:47 +0000 (13:00 +0000)]
Merge "Fix flaky testForAllWinddow"
Andrei Onea [Fri, 15 Feb 2019 13:50:47 +0000 (13:50 +0000)]
Use sampled value in hidden api logger
The hidden api logger interface also receives the actual sampled value.
This is an intermediate step before a new logging method is added.
Test: m
Bug:
119217680
(cherry picked from commit
31bde163932dab75a8301e43b2adcb684f0470ec)
Change-Id: I3345bdcdf57e1f60970c85572e503d7b33af7148
Merged-In: I707a2624a254a80391cdae277dd59daa503d055f
Izabela Orlowska [Wed, 20 Feb 2019 12:55:58 +0000 (12:55 +0000)]
Merge "AAPT2: allow regexes for extensions to not compress"
Adrian Roos [Wed, 20 Feb 2019 12:50:28 +0000 (12:50 +0000)]
Merge "Fix potential memory leak in SomeArgs"
Rubin Xu [Wed, 20 Feb 2019 12:35:38 +0000 (04:35 -0800)]
Merge "Skip unreachable route when estimating VPN destinations" am:
21078b1edd am:
e000de90f4
am:
12d2de6417
Change-Id: Id81038035eddf98d0c4546ddb25c8f6ed5736ad6
Rubin Xu [Wed, 20 Feb 2019 12:26:25 +0000 (04:26 -0800)]
Merge "Skip unreachable route when estimating VPN destinations" am:
21078b1edd
am:
e000de90f4
Change-Id: Ia9301b3bf52b42a742f1f6b3a02499a1404ed3f1
Bill Yi [Wed, 20 Feb 2019 12:22:27 +0000 (04:22 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id0e3afb74226f19cf422bdc5e33455a195676055
Rubin Xu [Wed, 20 Feb 2019 12:15:55 +0000 (04:15 -0800)]
Merge "Skip unreachable route when estimating VPN destinations"
am:
21078b1edd
Change-Id: Iafa9ecaf07a36f235b366655d2fa2165a676d1cd
TreeHugger Robot [Wed, 20 Feb 2019 12:09:36 +0000 (12:09 +0000)]
Merge "Fix a misspelled permission"
Sam Lin [Mon, 18 Feb 2019 12:50:26 +0000 (04:50 -0800)]
Disables display content scaling for foldables
When setting folded area with changes both in width and height (set
0,0,540,1080 to a 1080x2160 device), the content of display will be
auto-scaled to physical display size. It is not an expected behavior
for foldable devices. Disable auto-scale to fix this issue.
1. LogicalDisplay.configureDisplayLocked() scales the contents according
the DisplayInfo.flags.
2. DisplayInfo.flags should not be overridden by design for a logical
display.
3. Adds disableDisplayScaling() for DisplayFoldController to bypass that.
Bug:
123245311
Test: atest WmTests
Test: adb shell wm folded-area 0,0,840,1260
Change-Id: I9a24c5d56799981b4f2cfe82fdf1898d87193681
Treehugger Robot [Wed, 20 Feb 2019 12:00:15 +0000 (12:00 +0000)]
Merge "Skip unreachable route when estimating VPN destinations"
Andrei-Valentin Onea [Wed, 20 Feb 2019 11:57:26 +0000 (11:57 +0000)]
Merge "Add atom for logging hidden API usage"
Eric Sandness [Wed, 20 Feb 2019 11:57:09 +0000 (11:57 +0000)]
Merge "Doc Change For DPM.setPermittedInputMethods"
Sehee Park [Wed, 20 Feb 2019 11:54:38 +0000 (03:54 -0800)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal." am:
1d18e60e76 am:
87bba9d278
am:
94dbe8d0e3
Change-Id: I331a13b07d74f2b7755e3165bc584a0152501a83
Sehee Park [Wed, 20 Feb 2019 11:44:53 +0000 (03:44 -0800)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal." am:
1d18e60e76
am:
87bba9d278
Change-Id: Ie3e8a250b24acf668fbcdb48b6242e1ea83ebfa2
TreeHugger Robot [Wed, 20 Feb 2019 11:41:58 +0000 (11:41 +0000)]
Merge "Removed debugging logging that was left in."
Sehee Park [Wed, 20 Feb 2019 11:35:36 +0000 (03:35 -0800)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
am:
1d18e60e76
Change-Id: I8316ad19bb5633e5c6d64d6c7e589b4bb4548617
Treehugger Robot [Wed, 20 Feb 2019 11:14:24 +0000 (11:14 +0000)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
Roland Levillain [Wed, 20 Feb 2019 10:57:14 +0000 (10:57 +0000)]
Merge "Replace generic GC type flag with a specific Generational CC flag."
TreeHugger Robot [Wed, 20 Feb 2019 10:56:33 +0000 (10:56 +0000)]
Merge "Convert Android.mk file to Android.bp"
TreeHugger Robot [Wed, 20 Feb 2019 10:51:30 +0000 (10:51 +0000)]
Merge "Add Introspection API to retrieve AudioProductStrategies"
Michal Karpinski [Wed, 20 Feb 2019 10:50:32 +0000 (10:50 +0000)]
Merge "Add a way for holders of START_ACTIVITIES_FROM_BACKGROUND to allow bg activity starts starts from specific receivers"
Roland Levillain [Tue, 19 Feb 2019 18:09:58 +0000 (18:09 +0000)]
Replace generic GC type flag with a specific Generational CC flag.
The "gctype" device configuration flag (from the "runtime_native_boot"
namespace) was a string passed verbatim as an argument to the runtime
option "-Xgc". It was too generic, conveyed no typing information, and
was error-prone (there was no control over what was passed from the
server to the zygote, and then to the runtime).
This change replaces "gctype" with a specific, Boolean
"enable_generational_cc" flag. This new flag better reflects the
nature of the experiment to be conducted (either enable or disable
generational garbage collection in ART's concurrent copying
collector).
Test: core/jni/runtime_native_boot-flags-test.sh
Bug:
72446017
Bug:
120794191
Bug:
123754583
Change-Id: I30a73171c0dc3c7bc891c4f164eed0ba42b0f420
Narayan Kamath [Tue, 19 Feb 2019 18:42:56 +0000 (18:42 +0000)]
MediaProjection: Update permissions dialog.
- Include the app icon and a warning title.
- Update the detailed text to include the kind of information that
could potentially be captured by a screen recorder.
- Remove the checkbox that allows the grant to be permanent.
Bug:
124753835
Test: Manual
Change-Id: Ib1269b2ddaa3150fe850ea306961df3ad3420c6c
Izabela Orlowska [Fri, 1 Jun 2018 11:06:31 +0000 (12:06 +0100)]
AAPT2: allow regexes for extensions to not compress
Change-Id: I09d2ad1d1466643ca7628c6480224e16b9002ee5
Fixes:
67575899
Test: added + manual
Andrei-Valentin Onea [Wed, 20 Feb 2019 10:29:43 +0000 (10:29 +0000)]
Merge "Use sampled value in hidden api logger"
Ioannis Ilkos [Wed, 6 Feb 2019 11:43:48 +0000 (11:43 +0000)]
Add tracepoints for process starts
Add a tracepoint when we dispatch the startProcess msg and one for
handling it.
Test: WmTests:ActivityStackSupervisorTests && FrameworksServicesTests:ActivityManagerServiceTest
Change-Id: I796b6875873b6300b843920e00b97b3c83ddb331
TreeHugger Robot [Wed, 20 Feb 2019 09:43:51 +0000 (09:43 +0000)]
Merge "Introduce a way to turn a fullscreen window into freeform"
Bin Chen [Wed, 20 Feb 2019 09:34:04 +0000 (17:34 +0800)]
Fix potential memory leak in SomeArgs
When recycling SomeArgs in pool, some fields are not set to null.
Which result potential memory leak as SomeArgs in pool still holds
the reference object.
To fix this issue, clear all args when recycling.
Change-Id: Ie730c3889da948c60ef746ddbe2e926d94ad7e06
Signed-off-by: Bin Chen <bin0515@gmail.com>
Signed-off-by: Wei Huang <hwbest.v@gmail.com>
Martijn Coenen [Wed, 20 Feb 2019 09:33:41 +0000 (10:33 +0100)]
Kill app zygote when package is removed.
Since the app zygote is kept around for a few seconds after the last
isolated service using it goes away, it was possible to install a new
version of an app and launch a service before that timeout had expired -
causing the service to use the app zygote which loaded the old code. To
prevent this, clean up the app zygote as part of package process
cleanup.
Bug:
124401845
Test: manual
Change-Id: I2d2ef28280a9631275569e419283e160ca9e1105
Yunfan Chen [Mon, 18 Feb 2019 06:12:33 +0000 (15:12 +0900)]
Fix flaky testForAllWinddow
It was flaky because the exiting window may be removed before the
assertion. Prevent it from removal can fix it.
During the setup, while window get created, there are
WindowSurfacePlacer traversal being posted to mAnimationHandler. This
could happen while we run the test. During the traversal, all exiting
window will be removed if possible, and the test window will get
removed.
Wait until the traversal finished can fix the issue.
Bug:
77772044
Bug:
74078662
Bug:
124088319
Test: atest DisplayContentTests#testForAllWindows
Change-Id: I7f14605d3bd4a548755b7e88b0294168ab46ec7b
TreeHugger Robot [Wed, 20 Feb 2019 08:50:02 +0000 (08:50 +0000)]
Merge "Avoid resuming same activity twice"
TreeHugger Robot [Wed, 20 Feb 2019 08:38:30 +0000 (08:38 +0000)]
Merge "Hide sSystemFontMap in Typeface."
Po-Chien Hsueh [Wed, 20 Feb 2019 08:37:08 +0000 (16:37 +0800)]
Fix a misspelled permission
MANAGE_DYNAMIC_ANDROID is misspelled. Fix it.
Bug:
124637092
Test: adb shell am start-activity
Change-Id: I2db3643719f44fcd175ed175c037f17b6c4b6c07
Sudheer Shanka [Wed, 20 Feb 2019 08:11:25 +0000 (08:11 +0000)]
Merge "Ignore EEXIST errors when creating pkg specific dirs."
TreeHugger Robot [Wed, 20 Feb 2019 08:07:39 +0000 (08:07 +0000)]
Merge "Start RenderThread earlier to preload Vulkan/EGL drivers"
TreeHugger Robot [Wed, 20 Feb 2019 08:06:18 +0000 (08:06 +0000)]
Merge "Convert Android.mk file to Android.bp"
TreeHugger Robot [Wed, 20 Feb 2019 08:06:05 +0000 (08:06 +0000)]
Merge "MediaSession2: Add SessionCallback#onPostConnect()"
Bill Yi [Wed, 20 Feb 2019 07:57:32 +0000 (23:57 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1e9a93f1b40f89db42865246b67fdea660184808
TreeHugger Robot [Wed, 20 Feb 2019 07:47:48 +0000 (07:47 +0000)]
Merge "Use the broadCast Receiver to detect when the user is switched and register the notificationListner when the user is switched."
Bill Yi [Wed, 20 Feb 2019 07:23:09 +0000 (23:23 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I106603e2d97492c9c95bab4e6b65ccb6d040ee9c
TreeHugger Robot [Wed, 20 Feb 2019 07:16:41 +0000 (07:16 +0000)]
Merge "Actually use the height specified on bubble metadata"
Jeff Sharkey [Wed, 20 Feb 2019 07:07:33 +0000 (07:07 +0000)]
Merge "Respond to various API council feedback."
Jeff Sharkey [Wed, 20 Feb 2019 06:45:57 +0000 (23:45 -0700)]
Temporarily grant legacy storage to certain apps.
We've gone to great lengths to return "_data" columns that can be
successfully opened from managed code, which is thankfully how most
apps are working with media.
However, a small handful of apps appear to be passing these "_data"
paths down into native code, where we can't hook the open() syscall.
The only workaround we have is to grant these apps the "legacy"
storage view (meaning they can see the entire storage device), until
those developers can update their apps.
Bug:
124818022,
123996076,
124767356,
124531483
Test: manual
Change-Id: I995520e7c0071075dcae9daa8f311f17a187ae1b
TreeHugger Robot [Wed, 20 Feb 2019 06:54:10 +0000 (06:54 +0000)]
Merge "Changed ContentCaptureManager API so service can only disable itself."
Yunfan Chen [Thu, 17 Jan 2019 09:30:18 +0000 (18:30 +0900)]
Introduce a way to turn a fullscreen window into freeform
Change the exitFreeformMode to toggleFreeformMode. Now the original
maximize button will work as maximize/restore button.
Test: go/wm-smoke
Test: Manual test.
Bug:
117075771
Bug:
124475503
Change-Id: I268d053ed0e665b8ac5e56019c6ae8f8b7ee1317
TreeHugger Robot [Wed, 20 Feb 2019 06:46:51 +0000 (06:46 +0000)]
Merge "Adds DeviceConfig resets to RescueParty."
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 06:00:34 +0000 (22:00 -0800)]
[automerger skipped] Merge "Adding validate before switch feature." am:
f2cf09c945 am:
86ca0ba02f
am:
ad44dd90b1 -s ours
am skip reason: change_id I689aa494f031834b5cee76906922ebdafa9c77ed with SHA1
8d04800b7f is in history
Change-Id: I526bbe9f6405d152c22a1e53ce0bbbc8c7c9505d
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:47:24 +0000 (21:47 -0800)]
Merge "Adding validate before switch feature." am:
f2cf09c945
am:
86ca0ba02f
Change-Id: Ib886edf8fc3d1fa1703adcc0f91e8dff606face0
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:38:21 +0000 (21:38 -0800)]
Merge "Adding validate before switch feature."
am:
f2cf09c945
Change-Id: Ie3f4429c1d7efefb83cf8289481a37adddd83801
TreeHugger Robot [Wed, 20 Feb 2019 05:35:34 +0000 (05:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:25:00 +0000 (05:25 +0000)]
Merge "Adding validate before switch feature."
Tyler Gunn [Wed, 20 Feb 2019 05:16:32 +0000 (21:16 -0800)]
Merge "Add support for Telecom logging to obfuscate string phone numbers." am:
ae941732bb am:
bfd852a7bb
am:
600db05fb1
Change-Id: If249e9ac6f579856de3e3790eb2844ca93c7e5d2
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:07:30 +0000 (05:07 +0000)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
Tyler Gunn [Wed, 20 Feb 2019 05:07:09 +0000 (21:07 -0800)]
Merge "Add support for Telecom logging to obfuscate string phone numbers." am:
ae941732bb
am:
bfd852a7bb
Change-Id: Ib27221f30e053ea25d67cbb15625e402a58f6eda
Tyler Gunn [Wed, 20 Feb 2019 04:57:50 +0000 (20:57 -0800)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
am:
ae941732bb
Change-Id: I3ca1652cfd23ad3f94991c21e5072d4082cc20c8
Bill Yi [Wed, 20 Feb 2019 04:50:32 +0000 (20:50 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
ae15ee43e4 -s ours
am:
de81b53813 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifd646c19c8191214e009c07b0899c3daf1e06b88
Bill Yi [Wed, 20 Feb 2019 04:49:01 +0000 (20:49 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
aebba25f55 -s ours
am:
e7f4ad0326 -s ours
am skip reason: subject contains skip directive
Change-Id: I1214e99771f4f2af8405bde2a630b64328da8dc2
Bill Yi [Wed, 20 Feb 2019 04:47:29 +0000 (20:47 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
60685350c6 -s ours
am:
108226ada8 -s ours
am skip reason: subject contains skip directive
Change-Id: I16a40588cbae2f690da8946abd50faeb87005908
Bill Yi [Wed, 20 Feb 2019 04:45:32 +0000 (20:45 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
e6b0455e71 -s ours
am:
b8836a4941 -s ours
am skip reason: subject contains skip directive
Change-Id: I6193ff11287705f8ba889592530f660ec6046ca1
Bill Yi [Wed, 20 Feb 2019 04:43:50 +0000 (20:43 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
c691b7e52c -s ours
am:
94f6de35be -s ours
am skip reason: subject contains skip directive
Change-Id: I4586d58180b40099fb0f5cdc0b4ba27b4d21356f
Bill Yi [Wed, 20 Feb 2019 04:41:52 +0000 (20:41 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
6670b2287a -s ours
am:
e57adcce2a -s ours
am skip reason: subject contains skip directive
Change-Id: I35b8d1f2960bc4dcf018e39e1bd890d837f834bf
Bill Yi [Wed, 20 Feb 2019 04:40:18 +0000 (20:40 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
85c48edc69 -s ours
am:
4f522f602a -s ours
am skip reason: subject contains skip directive
Change-Id: I73d825f8d67573b315f4d0081f402552f387a2b2
Tyler Gunn [Wed, 20 Feb 2019 04:40:13 +0000 (04:40 +0000)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
Bill Yi [Wed, 20 Feb 2019 04:38:19 +0000 (20:38 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
8dfcae263a -s ours
am:
581268f5c0 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib5f32919ef5d60098b4f7c8e9a5bb6c8df08c586
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 04:36:12 +0000 (20:36 -0800)]
[automerger skipped] Merge "Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229 am:
2938bf23f7" into pi-dev-plus-aosp
am:
34cef65998 -s ours
am skip reason: change_id I51199eaf0bd87055c21fe61af50f4c353137d621 with SHA1
19661a4b4a is in history
Change-Id: I01678eab314d25c8df495d050e1228bcb4865c68