git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 08:44:57 +0000 (08:44 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e am: dbea58fe4b -s ours am: 6a223c3aaa -s ours am: 3d12b053bc -s ours
am: b8d90e47ef -s ours

Change-Id: I27d3617e32d59dde9324bf63a3912d12c6604816

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 08:23:19 +0000 (08:23 +0000)]

Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev am: b59324afa1 am: bf7981bf90 am: aed8d39fe7
am: b1974396f9

Change-Id: I158fa5d27c9d02c1c76f362f035de6c00a2f29e5

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 08:15:50 +0000 (08:15 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad am: 551e9b00ee -s ours am: 7d05ce8473 -s ours am: db8a0233a4 -s ours
am: 515556988f -s ours

Change-Id: Ic42ab0f8da9f3473ffcbfca130298ea185851802

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 08:15:40 +0000 (08:15 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e am: dbea58fe4b -s ours am: 6a223c3aaa -s ours
am: 3d12b053bc -s ours

Change-Id: Id2eeb3af6cd35bae85d1dedbcf8bf450534195b8

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 08:05:08 +0000 (08:05 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e am: dbea58fe4b -s ours
am: 6a223c3aaa -s ours

Change-Id: Idf18f2f7f59f15c12ed1f18c337f6a08913b7f34

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:56:54 +0000 (07:56 +0000)]

Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev am: 3850cf69e3 am: bad5ea4cb1 am: 0c557735b7
am: 83e2dc6874

Change-Id: I1b634dcf6691cd68c72d6241045f8cfe467d97fc

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:55:51 +0000 (07:55 +0000)]

Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev am: b59324afa1 am: bf7981bf90
am: aed8d39fe7

Change-Id: Id390a60af18718f4eb375318c3ea8eb1a2f85e10

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:49:06 +0000 (07:49 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724 am: ac782db7b2 -s ours am: 1f6fdce0b0 -s ours am: b90a10513e -s ours
am: 9d9ea4c320 -s ours

Change-Id: I98975c0659945be13e318b5a296fa849768eea3a

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:49:05 +0000 (07:49 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad am: 551e9b00ee -s ours am: 7d05ce8473 -s ours
am: db8a0233a4 -s ours

Change-Id: I8e64f428f1fc95d5387459a3f25c94e9bace9377

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:37:08 +0000 (07:37 +0000)]

Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev am: b59324afa1
am: bf7981bf90

Change-Id: Ib3e91f95f6bb6cde1c65be0d3cd9a9e3b45b0e7e

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:36:55 +0000 (07:36 +0000)]

Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev am: 3850cf69e3 am: bad5ea4cb1
am: 0c557735b7

Change-Id: I84b3def855146d6db4d9bd623e9e96c89e8081d4

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:32:32 +0000 (07:32 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60 am: fa863f597e -s ours am: 3d82e195f7 -s ours am: 0f9e3adcda -s ours
am: 2bbfea01e4 -s ours

Change-Id: Ib8fd9e360d017c7e8e2170d274485639435e3b44

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:30:57 +0000 (07:30 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad am: 551e9b00ee -s ours
am: 7d05ce8473 -s ours

Change-Id: I5c502117018ae3a155feaacd0e72ce14c302728b

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:29:59 +0000 (07:29 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724 am: ac782db7b2 -s ours am: 1f6fdce0b0 -s ours
am: b90a10513e -s ours

Change-Id: Iebc8057fc5a7fb58e90bc71db5dd25a456583e12

commit | commitdiff | tree

Masaho Nishikawa [Sat, 3 Mar 2018 07:28:54 +0000 (07:28 +0000)]

Merge "Add config to show an alert dialog for video charges" am: 1451124f86 am: 2c773d3f96
am: 513044b23a

Change-Id: I94af04cf0fca1dbcb6bb66cddcd473df22790f5f

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:16:45 +0000 (07:16 +0000)]

Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev am: 3850cf69e3
am: bad5ea4cb1

Change-Id: I4ab3e06e6a678dfff13d3ab205a497375b711f72

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:15:14 +0000 (07:15 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e
am: dbea58fe4b -s ours

Change-Id: Ic72202f29a2a0101edfe89bce777b9a514296ebd

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:11:41 +0000 (07:11 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724 am: ac782db7b2 -s ours
am: 1f6fdce0b0 -s ours

Change-Id: I890e25939e0ca062b0be8c628089dbe455302fa2

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:03:23 +0000 (07:03 +0000)]

Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev
am: b59324afa1

Change-Id: I34809b7775652fa23e145a73647b67292f41f10e

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 07:01:41 +0000 (07:01 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad
am: 551e9b00ee -s ours

Change-Id: I482f064fca94761b7d01597177d7642629cf1553

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 06:53:49 +0000 (06:53 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60 am: fa863f597e -s ours am: 3d82e195f7 -s ours
am: 0f9e3adcda -s ours

Change-Id: I6adf3f79ffb510e4770e9e39dcb1b5fd55d304f3

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 06:51:28 +0000 (06:51 +0000)]

Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev
am: 3850cf69e3

Change-Id: Ic7be79fc9564f5c3fda0e6874be6eb1f7edbb143

commit | commitdiff | tree

Masaho Nishikawa [Sat, 3 Mar 2018 06:51:01 +0000 (06:51 +0000)]

Merge "Add config to show an alert dialog for video charges" am: 1451124f86
am: 2c773d3f96

Change-Id: If13158f209eda968f0fd50787679c957a3e5ea96

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 06:49:53 +0000 (06:49 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724
am: ac782db7b2 -s ours

Change-Id: Ia227614e9fb5abe03c01ff7475f5ce2f7f06ef61

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 06:48:20 +0000 (06:48 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60 am: fa863f597e -s ours
am: 3d82e195f7 -s ours

Change-Id: Ie89698d2c1a3974e4721d9bcc36bc8141c91bd13

commit | commitdiff | tree

Masaho Nishikawa [Sat, 3 Mar 2018 06:39:45 +0000 (06:39 +0000)]

Merge "Add config to show an alert dialog for video charges"
am: 1451124f86

Change-Id: Idf89d421f3716dc00af97877d19d81445dd63f44

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 06:37:52 +0000 (06:37 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60
am: fa863f597e -s ours

Change-Id: I65d675e10fff69c1b45b8bb07a1acb1bcff17dbd

commit | commitdiff | tree

nharold [Sat, 3 Mar 2018 05:29:00 +0000 (05:29 +0000)]

Merge changes from topics "cdma-null-island", "cdma-signal-strength" am: d5ba391425 am: 78f2c228d1
am: 062e101ffa

Change-Id: I4b31899f32b80062440b8d695fb668191924aee7

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:28:03 +0000 (05:28 +0000)]

Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 05:27:27 +0000 (05:27 +0000)]

Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6
  Import translations. DO NOT MERGE

commit | commitdiff | tree

nharold [Sat, 3 Mar 2018 05:13:16 +0000 (05:13 +0000)]

Merge changes from topics "cdma-null-island", "cdma-signal-strength" am: d5ba391425
am: 78f2c228d1

Change-Id: I4b821915c69aedd594747520186b2fb123d34b78

commit | commitdiff | tree

nharold [Sat, 3 Mar 2018 04:55:01 +0000 (04:55 +0000)]

Merge changes from topics "cdma-null-island", "cdma-signal-strength"
am: d5ba391425

Change-Id: I1cd2ae9a3110f6c49cacfc3137c009a1e04227ea

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 04:53:46 +0000 (04:53 +0000)]

Merge "Removes unnecessary and incorrect instant app installer overrides"

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 04:47:22 +0000 (04:47 +0000)]

Merge "With build failure fix: Add stats logging in appDiedLocked."

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 04:20:18 +0000 (04:20 +0000)]

Merge "Remove javadoc for return value"

commit | commitdiff | tree

Phil Weaver [Sat, 3 Mar 2018 03:35:34 +0000 (03:35 +0000)]

Merge "Change a11y shortcut default lockscreen behavior"

commit | commitdiff | tree

Treehugger Robot [Sat, 3 Mar 2018 03:30:19 +0000 (03:30 +0000)]

Merge "Add config to show an alert dialog for video charges"

commit | commitdiff | tree

Chenjie Yu [Sat, 3 Mar 2018 03:26:23 +0000 (03:26 +0000)]

Merge "Avoid double logging for app overlay"

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 03:14:57 +0000 (03:14 +0000)]

Merge "Added cmd to change number of visible datasets on Autofill dataset picker."

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 03:14:38 +0000 (03:14 +0000)]

Merge "MediaPlayer2: implement some API's"

commit | commitdiff | tree

nharold [Sat, 3 Mar 2018 03:14:22 +0000 (03:14 +0000)]

Merge changes from topics "cdma-null-island", "cdma-signal-strength"

* changes:
  Set CDMA Location to Invalid if on Null Island
  Fix Range-Checking in CellSignalStrengthCdma
  Fix CDMA Range Checks for SignalStrength

commit | commitdiff | tree

nharold [Sat, 3 Mar 2018 02:57:41 +0000 (02:57 +0000)]

Merge "Expose Carrier Name Override CarrierConfig Values" am: a60e42cc2d am: f0b3b84a13
am: 5bc9756f8b

Change-Id: I747e769a5d278e90fa880d9d26011c6d010fd95d

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 02:53:16 +0000 (02:53 +0000)]

Merge "Release wakelock when binder died or exception occurs"

commit | commitdiff | tree

nharold [Sat, 3 Mar 2018 02:49:41 +0000 (02:49 +0000)]

Merge "Expose Carrier Name Override CarrierConfig Values" am: a60e42cc2d
am: f0b3b84a13

Change-Id: I074b386070118f8cac6efe3100ae88c378fd1a5e

commit | commitdiff | tree

nharold [Sat, 3 Mar 2018 02:33:59 +0000 (02:33 +0000)]

Merge "Expose Carrier Name Override CarrierConfig Values"
am: a60e42cc2d

Change-Id: I38b27197171009958ed362a83a119b9de3af2adf

commit | commitdiff | tree

Patrick Baumann [Fri, 2 Mar 2018 18:21:28 +0000 (10:21 -0800)]

Removes unnecessary and incorrect instant app installer overrides

This change removes priority overrides made when an intersplit
resolve is being made. It also removes unnecessary overrides
that are already set on the mInstantAppInstallerInfo default
ResolveInfo.

Change-Id: Ifbd7eda2f7df2fb3927447e8e9b8c91f992efe26
Fixes: 72408536
Test: manual - ensured intersplit launches work as expected
Test: atest EphemeralTest passes

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 01:33:14 +0000 (01:33 +0000)]

Merge "Camera: Clarify AF_REGIONS behavior in capture_result"

commit | commitdiff | tree

Suprabh Shukla [Sat, 3 Mar 2018 01:32:21 +0000 (01:32 +0000)]

Merge "An api to query usage events for the caller"

commit | commitdiff | tree

Evan Rosky [Sat, 3 Mar 2018 01:07:46 +0000 (01:07 +0000)]

Merge "Enabled state shouldn't effect children."

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 00:54:31 +0000 (00:54 +0000)]

Merge "MediaSession2: Add caller to the callback methods"

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:08 +0000 (00:44 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60

Change-Id: I634172b202c3401d476668f1173ab8fede42bc0b

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 3 Mar 2018 00:44:01 +0000 (00:44 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973

Change-Id: If3964293aa4ce9c51ecb353ef8c2ee817d14e460

commit | commitdiff | tree

Bill Yi [Sat, 3 Mar 2018 00:43:41 +0000 (16:43 -0800)]

Import translations. DO NOT MERGE

Change-Id: I741e6b188e72f4805e0eb34d27b93cdf89cfcad0
Auto-generated-cl: translation import

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 00:36:28 +0000 (00:36 +0000)]

Merge "Prevent nav bar vibrations when overview proxy is connected (1/2)"

commit | commitdiff | tree

Cassie Han [Sat, 3 Mar 2018 00:31:34 +0000 (00:31 +0000)]

Merge "Expand use of 'Str' suffix in CellIdentity to 'String'" am: d622eacb9e am: 3bcb6da703
am: d210655d48

Change-Id: Ibc0862fb7ae1063cbee10415c4c21d7d4a835c51

commit | commitdiff | tree

Wei Jia [Fri, 2 Mar 2018 19:31:18 +0000 (11:31 -0800)]

MediaPlayer2: implement some API's

Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: I10a4086db214b88f4a3eaea71fce81e8a994589a

commit | commitdiff | tree

Cassie Han [Sat, 3 Mar 2018 00:15:26 +0000 (00:15 +0000)]

Merge "Expand use of 'Str' suffix in CellIdentity to 'String'" am: d622eacb9e
am: 3bcb6da703

Change-Id: If07c5a8d84933e8a353a77b39a1aa76f4a51a5bf

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 3 Mar 2018 00:15:11 +0000 (00:15 +0000)]

Merge "Merge "Extend network request to query networks w/o capabilites" am: d846adac83 am: a3be78b5e7 am: f5312f3538"

commit | commitdiff | tree

Pavel Maltsev [Sat, 3 Mar 2018 00:14:52 +0000 (00:14 +0000)]

Merge "Extend network request to query networks w/o capabilites" am: d846adac83 am: a3be78b5e7
am: f5312f3538

Change-Id: I3bf776767be61577f1bca0d98d4aaf82a0e45336

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 00:14:22 +0000 (00:14 +0000)]

Merge "Report total latency instead of average for jobs last run"

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 00:13:40 +0000 (00:13 +0000)]

Merge "Creating new user correctly connects to the system OverviewProxy"

commit | commitdiff | tree

nharold [Sat, 3 Mar 2018 00:11:29 +0000 (00:11 +0000)]

Merge "Expose Carrier Name Override CarrierConfig Values"

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 3 Mar 2018 00:04:44 +0000 (00:04 +0000)]

Merge "Merge "Add result code for eUICC card not found." am: 45277c7aca am: 32c5a97aec am: 5f01f42723 -s ours"

commit | commitdiff | tree

Holly Jiuyu Sun [Sat, 3 Mar 2018 00:03:55 +0000 (00:03 +0000)]

Merge "Add result code for eUICC card not found." am: 45277c7aca am: 32c5a97aec
am: 5f01f42723 -s ours

Change-Id: I81f7ba0bdea05e7cc6d82294fb13daec4f4401c1

commit | commitdiff | tree

Pavel Maltsev [Sat, 3 Mar 2018 00:03:37 +0000 (00:03 +0000)]

Merge "Extend network request to query networks w/o capabilites" am: d846adac83
am: a3be78b5e7

Change-Id: Ie0c4fa4648c235589fecd79a25d28f1e62025fb7

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Mar 2018 00:02:52 +0000 (00:02 +0000)]

Merge "Modifying proto csv output to include privacy levels."

commit | commitdiff | tree

Phil Weaver [Sat, 3 Mar 2018 00:00:43 +0000 (16:00 -0800)]

Change a11y shortcut default lockscreen behavior

If the user hasn't chosen a preference, the shortcut
will not work on the lockscreen until the user agrees
to use the shortcut. After the user so agrees, the
shortcut will also work on the shortcut.

Bug: 70944865
Test: Adding a test for the new behavior
Change-Id: I41e1238fad43a4432cd341c6808e26ad6e155506

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 23:59:51 +0000 (23:59 +0000)]

Merge "Remove work mode tile if it is no longer available"

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 23:58:14 +0000 (23:58 +0000)]

Merge "MediaSession2: Add reset() to the MediaPlayerBase"

commit | commitdiff | tree

Tony Mak [Fri, 2 Mar 2018 17:24:10 +0000 (17:24 +0000)]

Remove work mode tile if it is no longer available

BUG: 72328528
Test: Remove work profile and observe the QS tile is gone.

Change-Id: I3467d0ecbeb3f6a79cdcce3c73dbef12b7519aca

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 23:56:45 +0000 (23:56 +0000)]

Merge "Add appops shell cmd for start/stop op"

commit | commitdiff | tree

Cassie Han [Fri, 2 Mar 2018 23:55:58 +0000 (23:55 +0000)]

Merge "Expand use of 'Str' suffix in CellIdentity to 'String'"
am: d622eacb9e

Change-Id: Ibe0c44df14dfa60855d513a85e76d8eef63d25a8

commit | commitdiff | tree

Pavel Maltsev [Fri, 2 Mar 2018 23:52:18 +0000 (23:52 +0000)]

Merge "Extend network request to query networks w/o capabilites"
am: d846adac83

Change-Id: Id1d86938fa2d5aff4dbf9cde87548d80c76674d9

commit | commitdiff | tree

Holly Jiuyu Sun [Fri, 2 Mar 2018 23:51:17 +0000 (23:51 +0000)]

Merge "Add result code for eUICC card not found." am: 45277c7aca
am: 32c5a97aec

Change-Id: I43b81392646b3f2463a3df37eecbf4ffa7a653d0

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:39:54 +0000 (23:39 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724

Change-Id: Icea7f683d6428ed86d7446071fd85547127ee9dc

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:39:48 +0000 (23:39 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6

Change-Id: Ic29200b8737f5718d33791faa5f7f12f3eeb9d76

commit | commitdiff | tree

Bill Yi [Fri, 2 Mar 2018 23:39:30 +0000 (15:39 -0800)]

Import translations. DO NOT MERGE

Change-Id: I823f9d64c30c157bd876f95c1f99ffddb0d88a4c
Auto-generated-cl: translation import

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 23:38:21 +0000 (23:38 +0000)]

Merge "Add API to let metrics directly drop data without writing to an output."

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:34:03 +0000 (23:34 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed skipped: b0046a8e4e

Change-Id: I334a5d4006779caa60b3459cf73aca3b086b06e3

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 23:33:58 +0000 (23:33 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 7a217545ed

Change-Id: I2ce2dd84a3c87c575059a2f33f99dd7d6f43bef5

commit | commitdiff | tree

Bill Yi [Fri, 2 Mar 2018 23:33:37 +0000 (15:33 -0800)]

Import translations. DO NOT MERGE

Change-Id: If394c2c84402b8d346f151b66e09337389425e47
Auto-generated-cl: translation import

commit | commitdiff | tree

Bryce Lee [Fri, 2 Mar 2018 23:22:25 +0000 (23:22 +0000)]

Merge "Wait to pause activity if translucent activity is waiting."

commit | commitdiff | tree

Holly Jiuyu Sun [Fri, 2 Mar 2018 23:21:13 +0000 (23:21 +0000)]

Merge "Add result code for eUICC card not found."
am: 45277c7aca

Change-Id: Ib3ee5ff8cfcc18ac6a9e616e34ef778fe59b111c

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 22:59:16 +0000 (22:59 +0000)]

Merge "Do not show 'no sims' icon in status bar."

commit | commitdiff | tree

Rajeev Kumar [Fri, 2 Mar 2018 22:42:13 +0000 (22:42 +0000)]

With build failure fix: Add stats logging in appDiedLocked.

This reverts commit bcf577a436faffa414d30b3a9c0b0209006b71f7.

Change-Id: I6d4a2aec4faf8ad4722a1c94c48858aebf408674

Test: runtest frameworks-services
Bug: 73660232

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 22:40:22 +0000 (22:40 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905 skipped: 2a68a8d9ad

Change-Id: I3eabd9c7e638ba1b860759c07fb27360a91d8ab3

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Mar 2018 22:40:15 +0000 (22:40 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905

Change-Id: I6b298dd7d2c471c2ec860b0760b97fd06a360d81

commit | commitdiff | tree

Bill Yi [Fri, 2 Mar 2018 22:39:55 +0000 (14:39 -0800)]

Import translations. DO NOT MERGE

Change-Id: If21d03f82c2a5eafaec39ecf54f05ed51fdacde6
Auto-generated-cl: translation import

commit | commitdiff | tree

Tri Vo [Fri, 2 Mar 2018 22:39:52 +0000 (22:39 +0000)]

Merge "Revert "Add stats logging in appDiedLocked.""

commit | commitdiff | tree

Adam Lesinski [Fri, 2 Mar 2018 22:38:46 +0000 (22:38 +0000)]

Merge "Change ownership of AAPT2 and libandroidfw"

commit | commitdiff | tree

Tri Vo [Fri, 2 Mar 2018 22:36:23 +0000 (22:36 +0000)]

Revert "Add stats logging in appDiedLocked."

This reverts commit e2b4c876284eb5e58f1a58cb23ee967e7d2e965b.

Reason for revert: git_master broken

Change-Id: I88e613fec4bdb3a5423770edc3f298867b44cd94

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 22:36:22 +0000 (22:36 +0000)]

Merge "AAPT2: Allow to inline XML into custom attribute"

commit | commitdiff | tree

Cassie Han [Fri, 2 Mar 2018 22:15:56 +0000 (22:15 +0000)]

Merge "Expand use of 'Str' suffix in CellIdentity to 'String'"

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 22:09:03 +0000 (22:09 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 22:07:47 +0000 (22:07 +0000)]

Merge "Fix reference to missing string"

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 22:07:47 +0000 (22:07 +0000)]

Merge "AAPT2: Remove resources that define locales but no default values."

commit | commitdiff | tree

Adam Lesinski [Fri, 2 Mar 2018 22:05:45 +0000 (22:05 +0000)]

Merge "Refactor AssetManager"

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 21:56:30 +0000 (21:56 +0000)]

Merge "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 21:32:34 +0000 (21:32 +0000)]

Merge "Add resources and hooks required for custom wear global actions."

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Mar 2018 21:32:34 +0000 (21:32 +0000)]

Merge "Add hooks for custom global actions handling without a status bar."

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.