OSDN Git Service
Maurice Lam [Sat, 15 Jul 2017 15:09:44 +0000 (15:09 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev am:
43e249ff27
am:
f4d873fd56
Change-Id: If4b688989d8f7c0da73e32a98a9ebba619c53397
Maurice Lam [Sat, 15 Jul 2017 15:01:13 +0000 (15:01 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev
am:
43e249ff27
Change-Id: Ifa239877c607468fe4ca9bdb87f712b10633762b
TreeHugger Robot [Sat, 15 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Load internal resources using name rather than ID" into oc-dr1-dev
TreeHugger Robot [Sat, 15 Jul 2017 08:53:51 +0000 (08:53 +0000)]
Merge "Fix nobootanimation toggle"
Evan Rosky [Sat, 15 Jul 2017 01:17:35 +0000 (01:17 +0000)]
Merge "Clean up @hide usages in cts tests"
TreeHugger Robot [Sat, 15 Jul 2017 01:09:46 +0000 (01:09 +0000)]
Merge "Don't crash when external storage is unmounted"
TreeHugger Robot [Sat, 15 Jul 2017 00:46:16 +0000 (00:46 +0000)]
Merge "Two more numbers in the preload log"
Fyodor Kupolov [Fri, 14 Jul 2017 23:54:23 +0000 (23:54 +0000)]
Merge "Additional metrics for PM init"
Peng Xu [Fri, 14 Jul 2017 23:28:51 +0000 (23:28 +0000)]
Merge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am:
17e641dae5 am:
6c5ee3d894" into oc-dr1-dev-plus-aosp
am:
6acd78fbd4
Change-Id: I1c26db45f1e33e7b03ed0e22b8868cca51e55e27
Peng Xu [Fri, 14 Jul 2017 23:27:14 +0000 (23:27 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am:
17e641dae5 am:
7bef937503
am:
5f309c6fd3
Change-Id: I03ff03b1ffe5e275f1551c3946eddc4fd766fd7b
Android Build Merger (Role) [Fri, 14 Jul 2017 23:21:19 +0000 (23:21 +0000)]
Merge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am:
17e641dae5 am:
6c5ee3d894" into oc-dr1-dev-plus-aosp
Peng Xu [Fri, 14 Jul 2017 23:19:52 +0000 (23:19 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am:
17e641dae5
am:
6c5ee3d894
Change-Id: If3d4bc3338c4baec3c79512140321b65e7ef949f
Peng Xu [Fri, 14 Jul 2017 23:18:30 +0000 (23:18 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am:
17e641dae5
am:
7bef937503
Change-Id: I108570f80973c02be45ea450747ffbb8cd0e094d
Kalle Raita [Fri, 14 Jul 2017 23:18:16 +0000 (16:18 -0700)]
Fix nobootanimation toggle
The sf.debug.nobootanimation was apparently broken in a recent
refactoring. Flipping the boolean in the utils fixes the issue.
Left some additional logging behind.
Test: marlin-eng boots
Test: my test can prevent the boot animation
Test: shell stop start shows boot animation
Change-Id: I815708a2f16a3a8688cf1a53695e5a8d43194575
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am:
17e641dae5
Change-Id: I4391dafa9d153213e35ac58bceb8d2f4c958fde0
Peng Xu [Fri, 14 Jul 2017 23:07:11 +0000 (23:07 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am:
17e641dae5
Change-Id: I3689c95bb249a77e6736f66e23065474a0916b9f
Christopher Tate [Thu, 13 Jul 2017 22:18:38 +0000 (15:18 -0700)]
Don't crash when external storage is unmounted
In particular, don't NPE if an app calls getExternalFilesDir() while
external storage is unmounted. We were making assumptions about the
length of the array returned by the "tell me about all the external
locations" method, but in unmounted cases that array can be zero-sized.
(And similar for getObbDir() and getExternalCacheDir().)
Bug:
63604311
Test: manual
Change-Id: I4dec828161245047182e6fd39a0df10dd1681ba2
TreeHugger Robot [Fri, 14 Jul 2017 22:55:15 +0000 (22:55 +0000)]
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
Mathieu Chartier [Fri, 14 Jul 2017 22:02:13 +0000 (22:02 +0000)]
Merge "Add more details to dumpsys meminfo -d" am:
4ccf8b83a1 am:
41718e2413 am:
811fa6d001
am:
151807c109
Change-Id: Iac4e5863dfb7fa69586abd396e5baece8367664e
TreeHugger Robot [Fri, 14 Jul 2017 22:00:01 +0000 (22:00 +0000)]
Merge "Don't tag bugreport notifications as System."
Mathieu Chartier [Fri, 14 Jul 2017 21:54:07 +0000 (21:54 +0000)]
Merge "Add more details to dumpsys meminfo -d" am:
4ccf8b83a1 am:
41718e2413
am:
811fa6d001
Change-Id: I309ff9dc070716cc250a7c06821775c185ea6ebc
Jason Monk [Fri, 14 Jul 2017 21:47:08 +0000 (21:47 +0000)]
Merge "Take a wrench to the pipes" into oc-dr1-dev am:
e1036c93a0
am:
bcfe19ebe8
Change-Id: I641b3b59958d360dc622bb55ce4eef1a49752a0e
Mathieu Chartier [Fri, 14 Jul 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Add more details to dumpsys meminfo -d" am:
4ccf8b83a1
am:
41718e2413
Change-Id: Ie3052ec70e478b69629e16526542cb616168b58b
Jason Monk [Fri, 14 Jul 2017 21:40:36 +0000 (21:40 +0000)]
Merge "Take a wrench to the pipes" into oc-dr1-dev
am:
e1036c93a0
Change-Id: I1a4606bc6996df2aa4b67645fbb06f0c2b46cd5c
TreeHugger Robot [Fri, 14 Jul 2017 21:38:56 +0000 (21:38 +0000)]
Merge "[Companion] Close chooser dialog on device tap"
Mathieu Chartier [Fri, 14 Jul 2017 21:37:43 +0000 (21:37 +0000)]
Merge "Add more details to dumpsys meminfo -d"
am:
4ccf8b83a1
Change-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904
TreeHugger Robot [Fri, 14 Jul 2017 21:33:51 +0000 (21:33 +0000)]
Merge "Take a wrench to the pipes" into oc-dr1-dev
Evan Laird [Fri, 14 Jul 2017 21:30:36 +0000 (21:30 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev am:
ed4d5fc925
am:
d0ee6987e1
Change-Id: I4e67ee75df6c53cf6a8133dc44cdb97dc9ab1a24
Evan Laird [Fri, 14 Jul 2017 21:25:05 +0000 (21:25 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
am:
ed4d5fc925
Change-Id: I7f97967d9cb7c6131489ab7202734c24e4076d2a
Treehugger Robot [Fri, 14 Jul 2017 21:21:39 +0000 (21:21 +0000)]
Merge "Add more details to dumpsys meminfo -d"
TreeHugger Robot [Fri, 14 Jul 2017 21:16:44 +0000 (21:16 +0000)]
Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 21:10:57 +0000 (21:10 +0000)]
Merge "Fix calculation of RelativeLayout width in RTL mode"
TreeHugger Robot [Fri, 14 Jul 2017 21:07:12 +0000 (21:07 +0000)]
Merge "removeAll unregisters callbacks in the wrong order, causing exception"
Android Build Merger (Role) [Fri, 14 Jul 2017 21:06:45 +0000 (21:06 +0000)]
Merge "Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev am:
cf70671a75 am:
dc458c33d6"
Wei Wang [Fri, 14 Jul 2017 21:05:43 +0000 (21:05 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev am:
cf70671a75
am:
dc458c33d6
Change-Id: I0068e1d5d869002d140d66f86117aa89a0b05456
Makoto Onuki [Fri, 14 Jul 2017 21:05:18 +0000 (14:05 -0700)]
Two more numbers in the preload log
Bug
63136392
Test: Manual
Change-Id: I0fa1dffa80d4d06cbfc41e0b40ddce5d324052ec
Fyodor Kupolov [Wed, 12 Jul 2017 23:38:40 +0000 (16:38 -0700)]
Additional metrics for PM init
Test: simulated build fingerprint change and checked logs
Bug:
62462279
Change-Id: I8446fcc9beed461a4554e79ab2b820839ced7c2f
Mathieu Chartier [Fri, 14 Jul 2017 20:58:13 +0000 (20:58 +0000)]
Merge "Add more details to dumpsys meminfo -d"
Wei Wang [Fri, 14 Jul 2017 20:56:13 +0000 (20:56 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
am:
cf70671a75
Change-Id: Ib7e61f66b52525d59fc8fe111124b859ddc52e04
Jian Sun [Fri, 14 Jul 2017 20:55:39 +0000 (20:55 +0000)]
Merge "Improve documentation for custome token."
Wei Wang [Fri, 14 Jul 2017 20:42:23 +0000 (20:42 +0000)]
Merge "SystemServiceManager: Change from wall time to boottiime" into oc-dr1-dev
Lucas Dupin [Fri, 14 Jul 2017 20:39:22 +0000 (20:39 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev am:
8d5b831095
am:
486ce65234
Change-Id: Ib2ff59f4ac52799d420ee3353cedb4762f7a02b1
TreeHugger Robot [Fri, 14 Jul 2017 20:36:13 +0000 (20:36 +0000)]
Merge "Fix 'cmd notification' crashes when no command is set."
Lucas Dupin [Fri, 14 Jul 2017 20:31:33 +0000 (20:31 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev
am:
8d5b831095
Change-Id: I8ced4304e4e6f6f766c7160e25122974ec0c9548
TreeHugger Robot [Fri, 14 Jul 2017 20:31:07 +0000 (20:31 +0000)]
Merge "Better preload drawable logging"
Philip Cuadra [Fri, 14 Jul 2017 20:27:09 +0000 (20:27 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev-plus-aosp
am:
d33013ade3
Change-Id: Ic9acd23267102bd4f7a6a924ec45c2efeac18aa1
TreeHugger Robot [Fri, 14 Jul 2017 20:24:37 +0000 (20:24 +0000)]
Merge "Move palette constants to XML" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 20:21:59 +0000 (20:21 +0000)]
Merge "Disable smart sharing for password fields."
TreeHugger Robot [Fri, 14 Jul 2017 20:19:02 +0000 (20:19 +0000)]
Merge "Use new powerHintAsync when available" into oc-dr1-dev-plus-aosp
Guliz Tuncay [Fri, 14 Jul 2017 17:19:45 +0000 (10:19 -0700)]
removeAll unregisters callbacks in the wrong order, causing exception
If we switch from a user with active SpellCheckerBindGroups to another
user, an exception is thrown and the system reports that the user switch
was not successful. The source of this exception is removeAll() method
used in unbindServiceLocked(). It seems that removeAll() retrieves the
number of callbacks of mListeners object and removes the registered
callbacks of this object one by one in a loop. However, this causes the
size of the mListeners change along the way and each element's index
decreases by one at each iteration, causing the loop to eventually try
to operate on a null object. This error was introduced by
I38942765ed6bec6713757b1d5f325e7a633c2ba7
Fixes:
63703656
Test: Manually tested as follows
1. Flash a new OS image with this change
2. Complete the setup wizard (if any)
3. make ApiDemos -j
4. adb install -r out/target/product/marlin/data/app/ApiDemos/ApiDemos.apk
5. Open "Api Demos" app
6. Go to Views/Text/EditText
7. Focus in to the first EditText then type "aaa"
8. Focus in to the second EditText then type "aaa"
9. Run `adb shell dumpsys textservices` to confirm that there are multiple
listener in one of the items in "Spell Checker Bind Groups" section.
10. Switch to the Guest user.
11. Run `adb logcat -s SystemServiceManager:E` to confirm that there is no
NullPointerException
Change-Id: Ibfdb07266a5a9127425b7ecffa9afbb8718eca62
Jeff Davidson [Fri, 14 Jul 2017 20:13:31 +0000 (20:13 +0000)]
Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev am:
c0ce489df7
am:
7183acc20e
Change-Id: I63232bdcde7bf4050140c20e41afc9e91bfb3b5f
Evan Laird [Fri, 14 Jul 2017 20:07:30 +0000 (20:07 +0000)]
Merge "Round mobile icon slash and fix color" into oc-dr1-dev am:
2809c2fb0b
am:
14c291e322
Change-Id: I02535631dad6d114987f23e5c8eb51cf211682d6
Jeff Davidson [Fri, 14 Jul 2017 20:07:26 +0000 (20:07 +0000)]
Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev
am:
c0ce489df7
Change-Id: Iea42444468b78c604f32ffd4a47eb8a1c762d2ab
Evan Laird [Fri, 14 Jul 2017 19:59:53 +0000 (19:59 +0000)]
Merge "Round mobile icon slash and fix color" into oc-dr1-dev
am:
2809c2fb0b
Change-Id: I93d2f84f98d65708d40bf58d8760e1a8d4a52d51
Jeff Davidson [Fri, 14 Jul 2017 19:54:52 +0000 (19:54 +0000)]
Merge "Temporarily disable eUICC factory reset handling." into oc-dr1-dev
Jesse Hall [Fri, 14 Jul 2017 19:52:30 +0000 (19:52 +0000)]
Merge "Preload app-process HALs in Zygote" into oc-dr1-dev am:
61d1af5746
am:
ceddb7508d
Change-Id: I9d2f4793b33ec81d20e7ffa6fffc88d8fab7f248
TreeHugger Robot [Fri, 14 Jul 2017 19:49:00 +0000 (19:49 +0000)]
Merge "Round mobile icon slash and fix color" into oc-dr1-dev
Jason Monk [Fri, 14 Jul 2017 19:45:04 +0000 (19:45 +0000)]
Merge "Fix crash in monodroid apps" into oc-dr1-dev am:
3d80a73350
am:
a6ef052f59
Change-Id: I098cd1c8d3ecf9c264a9720db226e123b6b7170f
Jesse Hall [Fri, 14 Jul 2017 19:40:45 +0000 (19:40 +0000)]
Merge "Preload app-process HALs in Zygote" into oc-dr1-dev
am:
61d1af5746
Change-Id: I2b51bd19d1fde7fc8e0e1cc9de71a3cd5d1a7ef9
TreeHugger Robot [Fri, 14 Jul 2017 19:36:09 +0000 (19:36 +0000)]
Merge "Don't log content of Autofill filter, since it could contain PII."
Jason Monk [Fri, 14 Jul 2017 19:35:18 +0000 (19:35 +0000)]
Merge "Fix crash in monodroid apps" into oc-dr1-dev
am:
3d80a73350
Change-Id: If80299af64fac8138e4cf9b681ebed13e09b8ccf
TreeHugger Robot [Fri, 14 Jul 2017 19:33:26 +0000 (19:33 +0000)]
Merge "Preload app-process HALs in Zygote" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:26:43 +0000 (19:26 +0000)]
Merge "Fix crash in monodroid apps" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 19:26:08 +0000 (19:26 +0000)]
Merge "[Companion] Dont store duplicate association records"
Mathieu Chartier [Thu, 13 Jul 2017 22:01:34 +0000 (15:01 -0700)]
Add more details to dumpsys meminfo -d
Added new subitems for
.dex:
boot vdex
app vdex
app odex
.art
app art
boot art
Fixed accounting for dalvik other to be subitems of other subsection
instead of dalvik.
Sample output:
261,892K: Native
213,196K: .dex mmap
111,620K: .App vdex
65,070K: .App dex
36,506K: .Boot vdex
192,320K: EGL mtrack
161,835K: .so mmap
134,922K: .apk mmap
85,612K: Dalvik
74,656K: .Heap
4,526K: .Zygote
4,218K: .LOS
2,212K: .NonMoving
64,906K: Unknown
52,119K: .oat mmap
42,828K: Dalvik Other
32,704K: .LinearAlloc
3,672K: .JITCache
3,248K: .IndirectRef
3,204K: .GC
40,754K: .art mmap
31,133K: .Boot art
9,621K: .App art
21,976K: Other mmap
20,704K: Stack
16,270K: Gfx dev
9,200K: GL mtrack
3,428K: Other dev
2,744K: .ttf mmap
1,116K: Ashmem
1,052K: .jar mmap
0K: Cursor
0K: Other mtrack
Test: dumpsys meminfo -d
Test: dumpsys meminfo -s
Test: dumpsys meminfo
Test: dumpsys meminfo <pid>
Test: dumpsys memifno -d <pid>
Bug:
32331673
(cherry picked from commit
95550dd39440196d364767fc18d441ed5a0e36d6)
Change-Id: I7557ee09510651c7b5ddee646c92adbcdd3472db
TreeHugger Robot [Fri, 14 Jul 2017 19:12:51 +0000 (19:12 +0000)]
Merge "Revert "Revert "Make scrollbarSize in Material Design theme configurable"""
TreeHugger Robot [Fri, 14 Jul 2017 19:08:54 +0000 (19:08 +0000)]
Merge "Refurbish granting mechanism"
Nate Fischer [Fri, 14 Jul 2017 19:07:11 +0000 (19:07 +0000)]
Merge "WebView: add IntDef for SafeBrowsingThreat"
sunjian [Fri, 14 Jul 2017 18:54:46 +0000 (11:54 -0700)]
Improve documentation for custome token.
Bug:
37963830
Test: none
Change-Id: I1ca14d0b5e0779ae96c867806ddcc6792621876f
Makoto Onuki [Fri, 14 Jul 2017 15:42:50 +0000 (08:42 -0700)]
Better preload drawable logging
Bug
63136392
Test: Manual test
Change-Id: I8753b36f632cf2ff57a5ef28df29f3fc5657f607
Wei Wang [Fri, 14 Jul 2017 18:39:30 +0000 (11:39 -0700)]
SystemServiceManager: Change from wall time to boottiime
elapsedRealtime is milliseconds since boot, including time spent in sleep
Bug:
63707383
Test: Build
Change-Id: I7db77565f2af6277f05400398044fad297872ea4
Felipe Leme [Fri, 14 Jul 2017 18:02:15 +0000 (11:02 -0700)]
Don't tag bugreport notifications as System.
Otherwise, they'll skip DND settings.
Test: mmm -j32 frameworks/base/packages/Shell && adb install -r -g ${OUT}/data/app/ShellTests/ShellTests.apk && adb shell am instrument -e class com.android.shell.BugreportReceiverTest$1 -w com.android.shell.tests/android.support.test.runner.AndroidJUnitRunner
Bug:
63509844
Change-Id: I7d802b4c8d115c989979a9edaff2f83fc19a4eae
Lucas Dupin [Fri, 14 Jul 2017 18:31:25 +0000 (18:31 +0000)]
Merge "Do not reload bitmap unless necessary" into oc-dr1-dev am:
c4c5d60607
am:
7ab87b35f1
Change-Id: Ic24856152dda569dff27ef5dc219c19e7a783a63
Felipe Leme [Fri, 14 Jul 2017 18:18:08 +0000 (11:18 -0700)]
Fix 'cmd notification' crashes when no command is set.
Test: adb shell cmd notification
Fixes:
63705462
Change-Id: Icdeed5b67913c4bde525171b36f8d6103aa5dfbd
TreeHugger Robot [Fri, 14 Jul 2017 18:22:57 +0000 (18:22 +0000)]
Merge "Fix typos in onProfileProvisioningComplete javadoc"
Lucas Dupin [Fri, 14 Jul 2017 18:21:30 +0000 (18:21 +0000)]
Merge "Do not reload bitmap unless necessary" into oc-dr1-dev
am:
c4c5d60607
Change-Id: I8985bfe8ed4a0067877ed042e256ecfa67ed5682
TreeHugger Robot [Fri, 14 Jul 2017 18:15:19 +0000 (18:15 +0000)]
Merge "Do not reload bitmap unless necessary" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 18:06:01 +0000 (18:06 +0000)]
Merge "Reduce the image size of media route button"
Jeff Sharkey [Fri, 14 Jul 2017 17:48:02 +0000 (17:48 +0000)]
Merge "Move "metered" persistence to WifiConfiguration."
Jeff Sharkey [Wed, 12 Jul 2017 16:50:42 +0000 (10:50 -0600)]
Move "metered" persistence to WifiConfiguration.
For a long time we've had a nasty tangled dependency between Wi-Fi
and NPMS, since they both persisted different details for configured
networks. As part of preparing for new carrier data plan APIs, move
the tracking of meteredness over to WifiConfiguration.
This also cleans up how meteredness is communicated through
NetworkAgents to rely completely on NET_CAPABILITY_NOT_METERED by
removing the metered flag on NetworkInfo, which has caused confusion
and staleness.
Migrates any existing user-configured metered networks over to
WifiConfiguration once the device finishes booting.
Remove support for NetworkQuotaInfo, since this information can no
longer be made available to apps. Frustratingly, some apps are
using it, so keep the object around returning stub values, and shame
them in the logs.
Bug:
63391323
Test: builds, boots, Wi-Fi policy is upgraded
Exempt-From-Owner-Approval: Bug
63673347
Change-Id: I64f865ddeb65cfcd330f8d2a847368abdf960a07
Felipe Leme [Fri, 14 Jul 2017 17:35:03 +0000 (10:35 -0700)]
Don't log content of Autofill filter, since it could contain PII.
Test: manual verification
Fixes:
63680114
Change-Id: I92dcb88df6b577ee2f7a4065e8f9b14ba01ba3fb
Android Build Merger (Role) [Fri, 14 Jul 2017 17:34:28 +0000 (17:34 +0000)]
Merge "Merge changes from topic 'camera-tron' into oc-dr1-dev am:
280165118d am:
7dcff07a28"
TreeHugger Robot [Fri, 14 Jul 2017 17:33:45 +0000 (17:33 +0000)]
Merge "Fix debug logging in WifiTracker."
Eino-Ville Talvala [Fri, 14 Jul 2017 17:32:49 +0000 (17:32 +0000)]
Merge changes from topic 'camera-tron' into oc-dr1-dev am:
280165118d
am:
7dcff07a28
Change-Id: I4dedd4ce9dac9f2a15b651fb9e3cd5c09b39e7c1
Abodunrinwa Toki [Thu, 13 Jul 2017 22:37:11 +0000 (23:37 +0100)]
Disable smart sharing for password fields.
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Bug:
62340817
Change-Id: Ifbf2c39d9f304251adc8c4acdf1b4fd6914011d8
Evan Laird [Fri, 14 Jul 2017 17:29:49 +0000 (13:29 -0400)]
Round mobile icon slash and fix color
Airplane mode slashed mobile signal icon should be rounded. Also it was
drawing in the foreground color instead of background. That was bad.
Test: visual
Change-Id: Ie7137929e1b54118482b0990e3d86ccb0f620e56
Fixes:
63533582
Eino-Ville Talvala [Fri, 14 Jul 2017 17:26:49 +0000 (17:26 +0000)]
Merge changes from topic 'camera-tron' into oc-dr1-dev
am:
280165118d
Change-Id: Ic163d728471cb1cdb7dfc60955452a0f1491dc76
Jason Monk [Fri, 14 Jul 2017 14:22:36 +0000 (10:22 -0400)]
Fix crash in monodroid apps
Don't getApplicationContext if we already have an application.
Test: launch a monodroid app
Change-Id: I0c1558463053de3db0f1cd4693088e7c639ce5fa
Fixes:
63666480
Jeff Davidson [Fri, 14 Jul 2017 16:46:19 +0000 (09:46 -0700)]
Temporarily disable eUICC factory reset handling.
This seems to be causing users who elect not to wipe their eUICC on a
factory reset to end up on the eSIM slot after the reset instead of
the pSIM slot.
Bug:
63693573
Test: TreeHugger + factory reset local test
Change-Id: I414a16cde11e76ccc390e7a63a6803f5b402fe78
Adrian Roos [Fri, 14 Jul 2017 17:20:20 +0000 (17:20 +0000)]
Merge "AOD: Show date on always-on display" into oc-dr1-dev am:
3fbe9d737a
am:
24563b62e0
Change-Id: Ie7f208bea3c86be02a90abc73a96b5ec7f28bb37
TreeHugger Robot [Fri, 14 Jul 2017 17:17:47 +0000 (17:17 +0000)]
Merge changes from topic 'camera-tron' into oc-dr1-dev
* changes:
CameraServiceProxy: Log camera usage metrics
CameraServiceProxy: Add CameraStatsLoggingService, event dumping
Adrian Roos [Fri, 14 Jul 2017 17:14:27 +0000 (17:14 +0000)]
Merge "AOD: Show date on always-on display" into oc-dr1-dev
am:
3fbe9d737a
Change-Id: I5fafed2ee739358c206e53adc08dcf25a6675560
TreeHugger Robot [Fri, 14 Jul 2017 17:05:27 +0000 (17:05 +0000)]
Merge "AOD: Show date on always-on display" into oc-dr1-dev
Mathieu Chartier [Thu, 13 Jul 2017 22:01:34 +0000 (15:01 -0700)]
Add more details to dumpsys meminfo -d
Added new subitems for
.dex:
boot vdex
app vdex
app odex
.art
app art
boot art
Fixed accounting for dalvik other to be subitems of other subsection
instead of dalvik.
Sample output:
261,892K: Native
213,196K: .dex mmap
111,620K: .App vdex
65,070K: .App dex
36,506K: .Boot vdex
192,320K: EGL mtrack
161,835K: .so mmap
134,922K: .apk mmap
85,612K: Dalvik
74,656K: .Heap
4,526K: .Zygote
4,218K: .LOS
2,212K: .NonMoving
64,906K: Unknown
52,119K: .oat mmap
42,828K: Dalvik Other
32,704K: .LinearAlloc
3,672K: .JITCache
3,248K: .IndirectRef
3,204K: .GC
40,754K: .art mmap
31,133K: .Boot art
9,621K: .App art
21,976K: Other mmap
20,704K: Stack
16,270K: Gfx dev
9,200K: GL mtrack
3,428K: Other dev
2,744K: .ttf mmap
1,116K: Ashmem
1,052K: .jar mmap
0K: Cursor
0K: Other mtrack
Test: dumpsys meminfo -d
Test: dumpsys meminfo -s
Test: dumpsys meminfo
Test: dumpsys meminfo <pid>
Test: dumpsys memifno -d <pid>
Bug:
32331673
Change-Id: Ib46aac6c6cd23f8594d4d06d8651d83f04c0b4d7
TreeHugger Robot [Fri, 14 Jul 2017 16:56:05 +0000 (16:56 +0000)]
Merge "Move duplicated union of HashSets logic into helper class"
Lucas Dupin [Thu, 6 Jul 2017 23:09:24 +0000 (16:09 -0700)]
Move palette constants to XML
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Change-Id: I22a5ef9b89c113f75261e8884fa1affb07b2265f
Fixes:
62373429
Adrian Roos [Fri, 14 Jul 2017 16:06:44 +0000 (16:06 +0000)]
Merge "AOD: Refactor low and high brightness modes" into oc-dr1-dev am:
930297e040
am:
a3e145bb60
Change-Id: I018804fb7e5ce7db9351633f50eb572d46714fae
TreeHugger Robot [Fri, 14 Jul 2017 16:02:26 +0000 (16:02 +0000)]
Merge "Move logic for backup journal into its own class"
Adrian Roos [Fri, 14 Jul 2017 16:00:22 +0000 (16:00 +0000)]
Merge "AOD: Refactor low and high brightness modes" into oc-dr1-dev
am:
930297e040
Change-Id: I7fce673716a81aaadcfc24eaa6af61e14348c1e1
TreeHugger Robot [Fri, 14 Jul 2017 15:49:57 +0000 (15:49 +0000)]
Merge "AOD: Refactor low and high brightness modes" into oc-dr1-dev