OSDN Git Service
Erik Kline [Thu, 29 Jun 2017 12:35:15 +0000 (12:35 +0000)]
Merge "No need to explicitly list ethernet upstream type" am:
01017959fe
am:
065e3a7786
Change-Id: I5442a9298822af5f6cbfa2570906bc38018c07e4
Erik Kline [Thu, 29 Jun 2017 12:26:53 +0000 (12:26 +0000)]
Merge "No need to explicitly list ethernet upstream type"
am:
01017959fe
Change-Id: I93a74d80db134e832cef16d61abc057c88e86675
Treehugger Robot [Thu, 29 Jun 2017 12:18:35 +0000 (12:18 +0000)]
Merge "No need to explicitly list ethernet upstream type"
Neil Fuller [Thu, 29 Jun 2017 11:45:04 +0000 (11:45 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast" am:
d129a14647
am:
93b232db41
Change-Id: I749e98ea84dd8c3811d302848a14576c6aff8fb1
Neil Fuller [Thu, 29 Jun 2017 11:37:13 +0000 (11:37 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast"
am:
d129a14647
Change-Id: I76324b2d983887dbdac4b26e518a68d8c4035a47
Treehugger Robot [Thu, 29 Jun 2017 11:29:37 +0000 (11:29 +0000)]
Merge "Use sendBroadcastAsUser rather than sendBroadcast"
Andre Eisenbach [Thu, 29 Jun 2017 08:45:01 +0000 (08:45 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)" am:
5790bae2f4
am:
df1831d2ee
Change-Id: I33fb994d049b033d9e58bbc080fa6ce1efc8e240
Andre Eisenbach [Thu, 29 Jun 2017 08:39:40 +0000 (08:39 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
am:
5790bae2f4
Change-Id: I480ef38d5aa61aa153ee53d325e8b249c1eab222
Andre Eisenbach [Thu, 29 Jun 2017 08:30:50 +0000 (08:30 +0000)]
Merge "HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)"
Jack He [Thu, 22 Jun 2017 19:56:54 +0000 (12:56 -0700)]
HFP: Modify comments for ACTION_HF_INDICATORS_VALUE_CHANGED (1/2)
* Per HFP 1.7.1 spec page 102 of 144
EXTRA_HF_INDICATORS_IND_ID should be int
EXTRA_HF_INDICATORS_IND_VALUE should be int
Bug:
35874078
Test: make, PTS test, unit tests
runtest -c com.android.bluetooth.btservice.RemoteDevicesTest bluetooth
Change-Id: Idd316a82bab164b6ea1701bb261b1cc3dee196f1
Erik Kline [Wed, 21 Jun 2017 14:27:55 +0000 (23:27 +0900)]
No need to explicitly list ethernet upstream type
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
36076442
Change-Id: I743c20d5b969e33c6b10d0b47ac06e6b8c968acf
yinxu [Thu, 29 Jun 2017 02:12:05 +0000 (02:12 +0000)]
Merge "Use Bundle for inter-process message" am:
db8e4efd5b
am:
5311da134a
Change-Id: I0b7d8ee5827c97fc761cb1fe102d4b89b364e9f7
yinxu [Thu, 29 Jun 2017 02:05:53 +0000 (02:05 +0000)]
Merge "Use Bundle for inter-process message"
am:
db8e4efd5b
Change-Id: Ib93e91969063a5d2276c99b8b0fee4dd1a398771
Andrii Kulian [Thu, 29 Jun 2017 01:57:32 +0000 (01:57 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
am:
36dbd3d43f
Change-Id: I30a4083e9c8467dd8698b50f0999b5ae20f2e01c
Treehugger Robot [Thu, 29 Jun 2017 01:51:04 +0000 (01:51 +0000)]
Merge "Use Bundle for inter-process message"
Andrii Kulian [Thu, 29 Jun 2017 01:47:41 +0000 (01:47 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
Robert Carr [Thu, 29 Jun 2017 00:26:35 +0000 (00:26 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
am:
e33c33e38a
Change-Id: Ie0733cb79acbe34536c4c031f1234dac134841d3
TreeHugger Robot [Thu, 29 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
Eugene Susla [Thu, 29 Jun 2017 00:03:08 +0000 (00:03 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am:
c55f7d2180
Change-Id: I9386692da93413a6b9fec51045d003fba5284401
TreeHugger Robot [Wed, 28 Jun 2017 23:54:49 +0000 (23:54 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
Andrii Kulian [Wed, 28 Jun 2017 23:21:07 +0000 (16:21 -0700)]
Further restrict activity launch on virtual displays
Only callers with INTERNAL_SYSTEM_WINDOW permission can launch
an activity to a virtual display.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I3f618fcbf3c07e5085e2b43b0f038f240df0c9d3
John Reck [Wed, 28 Jun 2017 22:45:50 +0000 (22:45 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
am:
38c97237e3
Change-Id: I3ef75aea36939b1dffa44500097709ef51787a1d
John Reck [Wed, 28 Jun 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
Jorim Jaggi [Wed, 28 Jun 2017 22:05:47 +0000 (22:05 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
am:
a96d749140
Change-Id: I2476d7710bff82e3eeedc0f48f61b57e392efbe7
Jorim Jaggi [Wed, 28 Jun 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
Evan Laird [Wed, 28 Jun 2017 21:38:13 +0000 (21:38 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
am:
91870d1587
Change-Id: Ie05d24e13dd2975d45acb59e594df0240d54c460
Evan Laird [Wed, 28 Jun 2017 21:30:15 +0000 (21:30 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I5deb45f1e2b2c0f667c5a37e70cdabe643f905ee
Phil Weaver [Wed, 28 Jun 2017 21:09:03 +0000 (21:09 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
Hall Liu [Wed, 28 Jun 2017 20:44:48 +0000 (20:44 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am:
c2f33f18eb
am:
761bad1c53
Change-Id: I7625defdce4fb4c69355f45d801729828646e659
Hall Liu [Wed, 28 Jun 2017 20:43:45 +0000 (20:43 +0000)]
Add download request tokens and enforce destination clear am:
2043f70acb
am:
8763c625a3
Change-Id: I6704e20ad1182fc8f97bd36700c54c3d2329da28
Hall Liu [Wed, 28 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am:
c2f33f18eb
Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
Hall Liu [Wed, 28 Jun 2017 20:35:54 +0000 (20:35 +0000)]
Add download request tokens and enforce destination clear
am:
2043f70acb
Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
Hall Liu [Wed, 28 Jun 2017 20:26:15 +0000 (20:26 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
Implement the cleanup action in MbmsDownloadReceiver
Add download request tokens and enforce destination clear
Andrii Kulian [Wed, 28 Jun 2017 19:56:48 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am:
b0c5d67bf1
Change-Id: Ib8d85b8c96ff2590669e39134623456a2004d008
Andrii Kulian [Wed, 28 Jun 2017 19:50:27 +0000 (19:50 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
Jorim Jaggi [Wed, 28 Jun 2017 18:40:27 +0000 (14:40 -0400)]
Properly check for orientation mismatch
Previous check tested against the display, which is wrong. Now
we properly check against the configuration.
Test: go/wm-smoke
Test: Enter split screen, go home, launch app, go home, relaunch
app, ensure no splash screen shown
Test: Enter split screen with 2 apps, lock phone, unlock phone
Change-Id: I62d45b6d3e5aa91dcb5edffed4233a5fed7ac9aa
Fixes:
63075521
Evan Laird [Wed, 28 Jun 2017 18:27:47 +0000 (14:27 -0400)]
Fix empty signal line thickness / color in status bar
Parameterize the line thickness to the height of the drawable. Also draw
the empty state as background signal instead of foreground.
Test: visual
Change-Id: I39a7ef3164b784008e3dba5284b7fe83e4666607
Fixes:
63097113
John Reck [Wed, 28 Jun 2017 18:08:07 +0000 (11:08 -0700)]
Selectively disable filtering if estimated safe
If the output matches the source rect then use
GL_NEAREST instead of GL_FILTER. This is a more
pixel-exact capture.
Bug:
38242146
Test: CtsUiRendering & CtsViewTestCases:.PixelCopyTest passes on fugu
Change-Id: I9f57a4124374568f83d45fdc8f83cc767ded888a
Mady Mellor [Wed, 28 Jun 2017 18:08:52 +0000 (18:08 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I670206eb1da007b1eeea5f022124a352b0644b6a
Eugene Susla [Wed, 28 Jun 2017 17:58:46 +0000 (10:58 -0700)]
[Companion] Dont crash if started with bluetooth off
Bug:
63068644
Test: Turn BT off, and ensure the attached bud doesn't reproduce
Change-Id: I0de5ba6d28d7195dd3ebc7a3af36f057c762de60
yinxu [Tue, 27 Jun 2017 21:05:17 +0000 (14:05 -0700)]
Use Bundle for inter-process message
The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.
Cherry-picked cleanly from:
https://googleplex-android-review.googlesource.com/#/c/
2467157/
Test: Telephony sanity tests
Bug:
30954762
Merged-in: I77945b247530b85c0b82876d528549498a711550
Changg-Id: I77945b247530b85c0b82876d528549498a711550
(cherry picked from commit
56049437095d3cb8334f667ff73061f2926b5416)
Change-Id: Iec4043e611a8f58733a361ec9a52fc74e1c974d5
Phil Weaver [Wed, 28 Jun 2017 16:46:32 +0000 (09:46 -0700)]
Don't break key event stream when enabling a11y
Bug:
62862624
Test: Enable magnification, then enable TalkBack with the
a11y shortcut. Verify that volume keys work.
A11y service CTS, a11y units tests.
Change-Id: I729ab17d24f758b5ce534ffde43d2126a1f9536c
Neil Fuller [Wed, 28 Jun 2017 17:20:30 +0000 (17:20 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage" am:
4e77ae6d1a
am:
4a7e3de5e7
Change-Id: I5db1d32b6141653e7971c4f1dd9931d4042bb19b
Neil Fuller [Wed, 28 Jun 2017 17:13:35 +0000 (17:13 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
am:
4e77ae6d1a
Change-Id: Ib30177ef93ecacfbd6ab0fb98f933fbf8af0e270
Andrii Kulian [Wed, 28 Jun 2017 16:42:48 +0000 (09:42 -0700)]
Restrict launching activities on virtual displays
If an app creates a Surface and a virtual display backed by that
Surface, it can then launch activities and hijack their content.
This CL restrict activities that can be launched to virtual displays
created by apps only to those who set "allowEmbedded" attribute.
If a virtual display was created by system, apps won't get access to
the surface, so we're not limiting in this case.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testLaunchNotEmbeddedOnVirtualDisplay
Change-Id: Ied216bdf33df4b5a6cc8cac0e006a4883a36f94f
Neil Fuller [Wed, 28 Jun 2017 17:01:56 +0000 (17:01 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
Mady Mellor [Wed, 21 Jun 2017 00:18:53 +0000 (17:18 -0700)]
If the menu hasn't been created yet don't do things with it
Test: runtest systemui
Fixes:
62594598
Change-Id: I1050e2b2bf1ece960d19ad13cb6a9bf71512db57
(cherry picked from commit
0b3f004acbb0eef38ee5e8d920e934f7ab2f7cde)
Bill Yi [Wed, 28 Jun 2017 15:21:44 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f36a995424 -s ours
Change-Id: I5a453dd7e4e36f992cf55e8b633cf766280b0fae
TreeHugger Robot [Wed, 28 Jun 2017 15:11:54 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jack He [Wed, 28 Jun 2017 08:37:50 +0000 (08:37 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)" am:
ceaccbfe70
am:
96f98f255b
Change-Id: I004b05f007def7f995112b867f102fe11b88064d
Jack He [Wed, 28 Jun 2017 08:32:54 +0000 (08:32 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)"
am:
ceaccbfe70
Change-Id: Ic3253ef666632aaaffe8e1547dc563cd3bca9e37
Treehugger Robot [Wed, 28 Jun 2017 08:26:13 +0000 (08:26 +0000)]
Merge "Add APIs to get remote device's battery level (1/2)"
Hall Liu [Thu, 22 Jun 2017 01:23:48 +0000 (18:23 -0700)]
Implement the cleanup action in MbmsDownloadReceiver
Implement ACTION_CLEANUP, add result codes for the ordered broadcasts,
and remove the download request extra for file descriptor requests
Change-Id: I5ee19ad0aefbdceacb636b3d17e197a6fb1bdaa6
Jack He [Sat, 17 Jun 2017 02:43:58 +0000 (19:43 -0700)]
Add APIs to get remote device's battery level (1/2)
* Add BluetoothDevice.getBatteryLevel() API to retreive battery level
information of remote device
* Add BluetoothDevice.ACTION_BATTERY_LEVEL_CHANGED intent to notify user
that remote device's battery level has changed
Bug:
35874078
Test: make, pair with devices and use them
Change-Id: I41051ee25383f5f3a1e505aef6f8c526385f58bd
Michal Karpinski [Tue, 27 Jun 2017 20:46:55 +0000 (20:46 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
am:
0d1b1a253a
Change-Id: Id2e6a870ff207eb25844ecbeca6b80630b2e0d28
Robert Carr [Tue, 27 Jun 2017 20:46:14 +0000 (13:46 -0700)]
Disable requestVisibleBehind.
As there is no caller for the SystemAPI convertToTranslucent, there is no situation
where requestVisibleBehind will actually result in the activity becoming
visible behind. However we have bugs in the requestVisibleBehind code-path,
so rather than fix them...it seems better to just prevent ourselves from
running in to them. Full deletion of the code-path is scheduled for post-O
branches.
Change-Id: I6e7c79e036986564d2d443a603e63c341de23057
Fixes:
62512584
Test: Repro from bug. go/wm-smoke.
Todd Kennedy [Tue, 27 Jun 2017 20:40:47 +0000 (20:40 +0000)]
Merge "Use content type specified on the command line" into oc-dev
am:
f89bf30312
Change-Id: I33dc8db8cf347b43a404cb0d33b7f6a0a005da6a
TreeHugger Robot [Tue, 27 Jun 2017 20:33:23 +0000 (20:33 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 20:30:45 +0000 (20:30 +0000)]
Merge "Use content type specified on the command line" into oc-dev
Shishir Agrawal [Tue, 27 Jun 2017 20:05:04 +0000 (20:05 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
am:
f1b57080a6
Change-Id: I879ad445f1dd1a2c39e71dd29bf155865318eead
Bill Yi [Tue, 27 Jun 2017 19:59:48 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a0376f250f -s ours
Change-Id: Iebd88570c6104dceaa4344c0ab2f53f354fa0ba9
Shishir Agrawal [Tue, 27 Jun 2017 19:50:37 +0000 (19:50 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:44:47 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Neil Fuller [Tue, 27 Jun 2017 17:53:58 +0000 (18:53 +0100)]
Use sendBroadcastAsUser rather than sendBroadcast
According to messages in the logcat sendBroadcastAsUser
is the better option.
Test: Manual
Bug:
31008728
Change-Id: I06bcd3c53878fc2b1b817337ea8719fcc4975501
Shishir Agrawal [Mon, 26 Jun 2017 19:06:03 +0000 (12:06 -0700)]
Supress roaming indications during a carrier network change.
Change-Id: Ib39d229b67374c4ca30c3a2c8c3b0050106733cd
Fixes:
62795179
Test: NetworkControllerSignalTest
Julius D'souza [Tue, 27 Jun 2017 17:20:51 +0000 (17:20 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours
am:
c994b07e98
Change-Id: I5f1b5b203b157c2c4475fc61e3d7daff6fa3f7ad
Julius D'souza [Tue, 27 Jun 2017 17:14:51 +0000 (17:14 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours
am:
1cd816eeac -s ours
Change-Id: I1535c1bc21f6c1eaa00787eb2b26a6085f7b69f7
Julius D'souza [Tue, 27 Jun 2017 17:08:48 +0000 (17:08 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor.
am:
789954fb69 -s ours
Change-Id: I049ea4d9b8a12740d4a62e2224dbd28dcedc72ba
Brad Ebinger [Tue, 27 Jun 2017 17:02:53 +0000 (17:02 +0000)]
Merge "IMS: Check for binderstate before calling endSession" am:
c49534cf09
am:
1de1c2bb66
Change-Id: I7901ec8b6e844d29a7c69a3570aaa10baa9c1419
Brad Ebinger [Tue, 27 Jun 2017 16:57:11 +0000 (16:57 +0000)]
Merge "IMS: Check for binderstate before calling endSession"
am:
c49534cf09
Change-Id: I9d173693c466b7d8512d11f266af48f5307669d5
Brad Ebinger [Tue, 27 Jun 2017 16:46:57 +0000 (16:46 +0000)]
Merge "IMS: Check for binderstate before calling endSession"
Michal Karpinski [Tue, 27 Jun 2017 14:08:57 +0000 (15:08 +0100)]
Fix an NPE when cancelling full backup in BMS#endFullBackup()
Bug:
63000171
Test: it's just a nullcheck that compiles
Change-Id: I90faa5577f2fd656bb4f7b6af39494590a77e3bf
Julius D'souza [Tue, 27 Jun 2017 13:48:51 +0000 (06:48 -0700)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor.
Bug:
62038345
Change-Id: I4b86a1b9ab56f560e863663b9f89195ae1187ab4
Kenny Guy [Tue, 27 Jun 2017 13:04:35 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: Ib663cf469da3b1cc5c41b385302db3c107290d23
TreeHugger Robot [Tue, 27 Jun 2017 12:55:39 +0000 (12:55 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
Neil Fuller [Tue, 27 Jun 2017 12:10:37 +0000 (12:10 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e
am:
4fee968fa8
Change-Id: I042861293371d07f62b05b28dc7c3a2ffb090812
Neil Fuller [Tue, 27 Jun 2017 12:05:17 +0000 (12:05 +0000)]
Merge "Switch to streaming data for time zone update"
am:
f093d4e13e
Change-Id: I3fd22fe47e1d7b86d4f88d527940c6812ecfa31b
Neil Fuller [Tue, 27 Jun 2017 11:56:53 +0000 (11:56 +0000)]
Merge "Switch to streaming data for time zone update"
Paul Duffin [Tue, 27 Jun 2017 11:34:01 +0000 (11:34 +0000)]
Merge "Clean up Predicate related code in android.test" am:
1230b249f1 -s ours
am:
1cd40dac5c
Change-Id: Idde6b4548f44eefb5633ee88f1a497b72f7d7f42
Julius D'souza [Tue, 27 Jun 2017 11:29:58 +0000 (11:29 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours
am:
af8e230787
Change-Id: Ifc935d4b6a9f8eccf26882130ef994288ea23e64
Paul Duffin [Tue, 27 Jun 2017 11:27:41 +0000 (11:27 +0000)]
Merge "Clean up Predicate related code in android.test"
am:
1230b249f1 -s ours
Change-Id: I4836793deccd83e06129ad18035f4f4acf5f8617
Julius D'souza [Tue, 27 Jun 2017 11:25:01 +0000 (11:25 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours
am:
8af046a55e -s ours
Change-Id: I6535c07aaf3a62db028da439ead2172c756ef63f
Julius D'souza [Tue, 27 Jun 2017 11:19:01 +0000 (11:19 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
am:
fef074ad29 -s ours
Change-Id: I9e6702dc1e7f9dd875f39cfa61bccdb9dfe117a1
Bill Yi [Tue, 27 Jun 2017 11:11:21 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I65e9dd68965e710fc1e4d62d939fb6dc438b2e87
Auto-generated-cl: translation import
Julius D'souza [Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
Paul Duffin [Tue, 27 Jun 2017 10:57:34 +0000 (10:57 +0000)]
Merge "Clean up ClassPathPackageInfoSource" am:
8c7026c5a3
am:
1c6a5ad92e
Change-Id: I5f24e0e8a5b4c592e60e749df66df3908d1620f5
Paul Duffin [Tue, 27 Jun 2017 10:52:39 +0000 (10:52 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
am:
8c7026c5a3
Change-Id: I503ae16c4d47ce3cecb79987da919c7f579347da
Paul Duffin [Tue, 27 Jun 2017 10:42:56 +0000 (10:42 +0000)]
Merge "Clean up Predicate related code in android.test"
Paul Duffin [Tue, 27 Jun 2017 10:42:51 +0000 (10:42 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
Kenny Guy [Mon, 26 Jun 2017 18:13:56 +0000 (19:13 +0100)]
Fix deadlock in NetworkLoggingHandler
Stop NetworkLoggingHandler holding a lock
when calling back into DevicePolicyManagerService.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithTwoUsers
Bug:
62966480
Change-Id: I41c3edca8922008a9d838d71ddcc50883699bc74
Selim Cinek [Tue, 27 Jun 2017 10:00:34 +0000 (10:00 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
am:
06fdcf8a40
Change-Id: Ife4c2d8eb5a7146a46b8cc8d088442b5e0790949
TreeHugger Robot [Tue, 27 Jun 2017 09:54:20 +0000 (09:54 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
Bill Yi [Tue, 27 Jun 2017 06:31:35 +0000 (23:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b1c5afc07918dbfe5df18e33ab4a16c0bdba59
Auto-generated-cl: translation import
Bryce Lee [Tue, 27 Jun 2017 04:20:34 +0000 (04:20 +0000)]
Merge "Add aborted start result." into oc-dev
am:
8796c20dae
Change-Id: I893c429db5c71747fda8e390ee7d9d786ce0c53a
Bryce Lee [Tue, 27 Jun 2017 04:14:20 +0000 (04:14 +0000)]
Merge "Add aborted start result." into oc-dev
Makoto Onuki [Mon, 26 Jun 2017 23:31:56 +0000 (23:31 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am:
9f607f4c0b
Change-Id: Iddf617784c20bfd835413e934071aea3b02d5d6c
Benergy Meenan Ravuri [Tue, 20 Jun 2017 11:30:42 +0000 (17:00 +0530)]
IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug:
62816014
Change-Id: I1bb588ce2be9c181355ff744f43dad4e784e4ec5
Bryce Lee [Mon, 26 Jun 2017 23:27:32 +0000 (16:27 -0700)]
Add aborted start result.
Previously, we were returning START_SUCCESS when ActivityStarter
aborted launching the activity. This hides this activity and makes it
harder to debug.
This CL adds a new start result type to capture this internally.
Bug:
38121026
Test: manual
Test: go/wm-smoke
Change-Id: I97699b22b1eff476724c48db0c29daa0566ad280
TreeHugger Robot [Mon, 26 Jun 2017 23:25:10 +0000 (23:25 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
OSDN Git Service
