326716 Commits

Author SHA1 Message Date
Kenny Guy
9f84093386 Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am: ba18b0c683

Change-Id: I80adc11fae6eb7ed72c1f304a560e2a5c9f93108
2017-06-27 13:04:36 +00:00
TreeHugger Robot
ba18b0c683 Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev 2017-06-27 12:55:45 +00:00
TreeHugger Robot
23ed7d7699 Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev 2017-06-27 12:28:55 +00:00
Julius D'souza
889d326eda 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: I26adc1561e90d9eeca58bb130c2c137e6fea9f40
2017-06-27 11:30:00 +00:00
Julius D'souza
af8e230787 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
2017-06-27 11:25:01 +00:00
Julius D'souza
8af046a55e 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
2017-06-27 11:19:01 +00:00
Julius D'souza
fef074ad29 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 2017-06-27 11:06:46 +00:00
Kenny Guy
08a8783c56 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
2017-06-27 11:38:00 +01:00
Selim Cinek
656c1105f6 Merge "Fixed an accessibility issue with the pin view" into oc-dev
am: 06fdcf8a40

Change-Id: Ifba5dcd771b7156f9e12bb1a2b9311241850ba8c
2017-06-27 10:00:35 +00:00
TreeHugger Robot
06fdcf8a40 Merge "Fixed an accessibility issue with the pin view" into oc-dev 2017-06-27 09:54:28 +00:00
Bryce Lee
943794bb70 Merge "Add aborted start result." into oc-dev
am: 8796c20dae

Change-Id: I849ea5bfce87bd6a9264308e40242f6a2026713c
2017-06-27 04:20:35 +00:00
Bryce Lee
8796c20dae Merge "Add aborted start result." into oc-dev 2017-06-27 04:14:26 +00:00
TreeHugger Robot
049543b771 Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev 2017-06-27 01:59:30 +00:00
Shishir Agrawal
aef55ec08b Merge "Supress roaming indications during a carrier network change." into oc-dr1-dev 2017-06-27 01:23:14 +00:00
TreeHugger Robot
776220d029 Merge "Pass calling package to resolution UI." into oc-dr1-dev 2017-06-27 00:48:39 +00:00
TreeHugger Robot
c4ccefc7fd Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev 2017-06-26 23:49:07 +00:00
Makoto Onuki
eb63919bc4 Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am: 9f607f4c0b

Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5
2017-06-26 23:31:59 +00:00
Bryce Lee
f9d4954f30 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
2017-06-26 16:27:32 -07:00
TreeHugger Robot
9f607f4c0b Merge "Fix activity icon badging for non-bitmap icons" into oc-dev 2017-06-26 23:25:17 +00:00
Ying Xu
231e291b06 Merge "Fix the inconsistency of scan status." into oc-dr1-dev 2017-06-26 23:10:00 +00:00
TreeHugger Robot
59a66b8601 Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev 2017-06-26 22:48:06 +00:00
TreeHugger Robot
be196018e1 Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev 2017-06-26 21:49:04 +00:00
Chris Craik
f65e92d9f9 Use NativeAllocationRegistry for ColorFilter
Bug: 62994689
Test: bit CtsGraphicsTestCases:*

Change-Id: Icea01fa7d4c6e78f3a93434de64bc8ddfe0c7a0e
2017-06-26 21:33:47 +00:00
Android Build Merger (Role)
5345fce58f Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am: 61196fef1f" into oc-dr1-dev 2017-06-26 20:59:56 +00:00
Bryce Lee
250567130a Merge "Revert "Add ActivityInfo logging."" into oc-dev
am: 61196fef1f

Change-Id: I7f11b4a66def7cb49ba20a4ab4772eea0a25ef16
2017-06-26 20:59:00 +00:00
TreeHugger Robot
c4e8720eb2 Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev 2017-06-26 20:58:29 +00:00
Bryce Lee
61196fef1f Merge "Revert "Add ActivityInfo logging."" into oc-dev 2017-06-26 20:50:05 +00:00
Shishir Agrawal
7ef5b88726 Supress roaming indications during a carrier network change.
Change-Id: Ib39d229b67374c4ca30c3a2c8c3b0050106733cd
Fixes: 62795179
Test: NetworkControllerSignalTest
2017-06-26 20:45:43 +00:00
Todd Kennedy
a350db60bd Merge "Filter instant apps with different names" into oc-dev
am: adcc94f160

Change-Id: Ia4d1b58648ceb986b0af014cb6b3a6f6c0b2ce2f
2017-06-26 20:13:57 +00:00
Jason Monk
a86cc7098a Merge "Fix QS lock screen animation" into oc-dev
am: aa2286e417

Change-Id: I1364155b6a325653d63c74ab407c787756abb5ca
2017-06-26 20:12:22 +00:00
TreeHugger Robot
adcc94f160 Merge "Filter instant apps with different names" into oc-dev 2017-06-26 20:06:24 +00:00
TreeHugger Robot
aa2286e417 Merge "Fix QS lock screen animation" into oc-dev 2017-06-26 19:59:27 +00:00
TreeHugger Robot
56a1a7d331 Merge "Add missing ints to palette" into oc-dr1-dev 2017-06-26 19:38:45 +00:00
Christine Franks
ca4def2ac8 Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev 2017-06-26 19:28:30 +00:00
Evan Laird
6f4179c3b8 Use BatteryMeterDrawableBase as QS icon for Battery Saver
This ensures that QS, Settings, and Status bar all use the same drawable
base so they will always look the same. Battery saver is essentially a
full battery that always shows the power saver iconography.

Test: visual; runtest -x
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug: 62668861
Change-Id: I8a9d5e59c9bb38c0ef794a0ed591195809521f70
2017-06-26 14:20:00 -04:00
Chet Haase
32974e0705 Merge "Fix TimePicker RTL issues" into oc-dev
am: 7b95c932d6

Change-Id: Ie1b08ed95b5182c9d8afb423153568e20ac50fe0
2017-06-26 18:18:51 +00:00
Chet Haase
7b95c932d6 Merge "Fix TimePicker RTL issues" into oc-dev 2017-06-26 18:07:32 +00:00
Todd Kennedy
1dfb21b673 Filter instant apps with different names
ag/2447596 introduced a regression that caused instant apps to be
made visible to one another.

Change-Id: I5db9a43f05dd5bec991cc0934b1c9a9406dfade6
Fixes: 62998487
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
2017-06-26 10:57:08 -07:00
Jason Monk
bdefffd1e8 Fix QS lock screen animation
Now that we have a footer, heights and clippings need to be adjusted
to be more accurate.
 - Clip QS within its layout box regardless of its y translation
 - Calculate height diffs correctly

Test: visual
Change-Id: Ic46996e342cd1000215aa9256da920a7856bb5a4
Fixes: 62489284
2017-06-26 13:50:54 -04:00
TreeHugger Robot
43a0236891 Merge "Add release haptic to nav bar buttons" into oc-dr1-dev 2017-06-26 17:32:47 +00:00
Todd Kennedy
6939301147 Merge "null check before dereference" into oc-dev
am: df8569787c

Change-Id: I62067d87f75367bb527862d3ac3873b3c94c9b7c
2017-06-26 17:10:14 +00:00
TreeHugger Robot
df8569787c Merge "null check before dereference" into oc-dev 2017-06-26 16:59:38 +00:00
Daniel Nishi
7049137d7f Merge "Upstream getApplicationLabel()." into oc-dr1-dev 2017-06-26 16:58:18 +00:00
Sooraj Sasindran
b7650d2233 Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev 2017-06-26 16:50:26 +00:00
Bryce Lee
ef49568f0d Revert "Add ActivityInfo logging."
This reverts commit 7e84086387cba189bb0c20f9ed17784840a2904a.

Reason for revert: No Longer needed.

Change-Id: Id6a3c66908a0b7b2e6a666f86f30ce05d3964b4b
2017-06-26 16:35:24 +00:00
Todd Kennedy
7833e7c5cb null check before dereference
Change-Id: I6ae219b68920c160e104b307f60802fd75e705ce
Fixes: 62908319
Test: Manual
2017-06-26 07:51:54 -07:00
Christine Franks
c99c0e2297 Add ACTION_DISMISS_TIMER intent
Bug: 38475809
Test: manual - visual inspection of code
Change-Id: I9e58c9699fc2e6afad38db6b44f2e2b649564327
2017-06-26 14:34:47 +00:00
Chet Haase
e2dfa0e343 Fix TimePicker RTL issues
The TimePicker (seen when creating an alarm in the Clock app) has
two bugs in landscape mode:
- The hours/minutes switch places (hours should always be to the left
of minutes, regardless of RTL)
- The layout is completely messed up in 12-hour mode (the radial time picker
does not appear on the screen)

This fix addresses both issues by setting the layoutDirection="ltr"
attribute to force a couple of the layouts to be unaffected in RTL mode.
Specifically, the hours/minutes layout and the overall layout will always be
presented left-to-right.

Bug: 62846484  TimePicker layout is broken in RTL landscape mode
Test: manual (tested with/without fix in normal, forded-RTL mode, and
with Hebrew as the first locale).

Change-Id: I8ef3f2706660f60c162ba3d324a18b8f370f67f8
2017-06-26 06:44:57 -07:00
Richard Uhler
a178205e8b Fix bug in reporting SwapPss in dumpsys meminfo.
Bug: 29875093
Test: Run dumpsys meminfo -a, verify SwapPss adds up and is non-zero
      for dalvik and native.

Change-Id: I79d0b6a59bf5f4e73f75f0b9540ec0fcc9e23b02
2017-06-26 06:34:04 +00:00
TreeHugger Robot
f05929af73 Merge "Consider double tap of the play/pause as the next track" into oc-dr1-dev 2017-06-25 01:26:49 +00:00