Commit Graph

301953 Commits

Author SHA1 Message Date
TreeHugger Robot
ec4e0b075f Merge "Create a new jank test to measure HW layer resize performance" 2017-01-09 18:50:56 +00:00
TreeHugger Robot
1fe396f67d Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 2017-01-09 18:46:14 +00:00
TreeHugger Robot
09ca5f52a0 Merge "Expose fields in WifiConfiguration." 2017-01-09 18:39:34 +00:00
TreeHugger Robot
a2b61657c4 Merge "Add @Nullable to CompoundButton#setOnCheckedChangeListener()." 2017-01-09 18:33:44 +00:00
Chris Craik
2294458565 Merge "Fix NPE in RenderNodeAnimator ALPHA when used outside ViewPropertyAnimator" 2017-01-09 18:15:32 +00:00
Calin Juravle
9f7b7ce0c8 Merge "Do not try to resolve realpath in DexManager." 2017-01-09 18:12:17 +00:00
Jiaquan He
4290cd28f0 Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev am: b100a9ac58
am: 78f5430f35

Change-Id: I8887f47b9647841a58d2399c699f0433ad1189c7
2017-01-09 18:09:02 +00:00
Jiaquan He
5ae46bcb73 Force Grid-based Recents to show at most 8 tasks. am: 883887eac9
am: e1aee8bc8c

Change-Id: I3c231912c7be65768e8ade869203bfdc3c155624
2017-01-09 18:08:03 +00:00
Jiaquan He
78f5430f35 Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev
am: b100a9ac58

Change-Id: I74d039468db01cf1018ab397b94f70b1d517432b
2017-01-09 18:03:41 +00:00
Jiaquan He
e1aee8bc8c Force Grid-based Recents to show at most 8 tasks.
am: 883887eac9

Change-Id: I3960939f61acd8834101767481e5cafa7d9aac23
2017-01-09 18:03:34 +00:00
Derek Sollenberger
c543713bab Merge "Remove clipRegion from the public API." 2017-01-09 18:01:50 +00:00
TreeHugger Robot
b100a9ac58 Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev 2017-01-09 17:56:46 +00:00
Jiaquan He
883887eac9 Force Grid-based Recents to show at most 8 tasks.
Bug: 32101881
Bug: 33975969

Change-Id: Icbadaa3ca12f53e57e06dd19d7809a23e0efa88c
2017-01-09 09:51:24 -08:00
Alex Naidis
bede012069 Merge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844 am: edca8aa3a8
am: 32dfe8c611

Change-Id: I5faf99bd2b4425f1615419de43f247f78d74108b
2017-01-09 17:14:34 +00:00
Alex Naidis
32dfe8c611 Merge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844
am: edca8aa3a8

Change-Id: Idbd8b16f0825bdcf48d2013448c767d0966434fe
2017-01-09 17:09:31 +00:00
Alex Naidis
edca8aa3a8 Merge "StorageManager: Improve exception handling" am: cf3a4a68bd
am: 545cf37844

Change-Id: I452e3fcbda9cfa24db5b2bfdd077b7e5a7b241b4
2017-01-09 17:04:32 +00:00
Alex Naidis
545cf37844 Merge "StorageManager: Improve exception handling"
am: cf3a4a68bd

Change-Id: Id421cb483655dab6d379251d983da2bdcafe598d
2017-01-09 16:59:56 +00:00
Makoto Onuki
363e9f78ef Merge "Do not call RecoverySystem with DPMS lock held" 2017-01-09 16:53:10 +00:00
Treehugger Robot
cf3a4a68bd Merge "StorageManager: Improve exception handling" 2017-01-09 16:48:36 +00:00
Alison Cichowlas
0f961084ce Merge "Log wrapper for multi-metrics in tron." 2017-01-09 16:39:04 +00:00
Alex Naidis
19d9c2d03c StorageManager: Improve exception handling
When "getPrimaryStorageSize" provides a path
to "readLong", the option that the path
doesn't exist is expected, since it tries
all paths from "INTERNAL_STORAGE_SIZE_PATHS"
until there is success.

This patch makes us catch the "FileNotFoundException"
and "NumberFormatException" seperately.

For the above reason a "FileNotFoundException"
is now treated as an information only.
The "NumberFormatException" and other exceptions
are now treated as error since those are not
expected to happen.

Change-Id: I5316f9c3108e36c31b27dc5df8bf8ac4d4257629
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2017-01-09 16:27:52 +00:00
Jerome Gaillard
04ae94e7ef Merge "Implement delegate for new native method from Bitmap" 2017-01-09 16:07:57 +00:00
Robin Lee
accc15536c Merge "Don't move-to-front overlays for unresumed tasks" 2017-01-09 16:01:58 +00:00
Julia Reynolds
6eb2857ee2 Merge "Cannot have badge only channels" 2017-01-09 14:59:50 +00:00
Jerome Gaillard
9758e22d2c Implement delegate for new native method from Bitmap
The method Bitmap.nativeCopyPreserveInternalConfig was introduced by
Change Ic128dfed.

Test: Run layoutlib tests
Change-Id: I13da7deece9eb1d0d3e6a42203522fcf0b332ba9
2017-01-09 14:27:01 +00:00
Android Build Merger (Role)
82e955fcfe Merge "Merge "Fix message for screen unpinning" into nyc-mr2-dev am: b0181b634e am: 0cf4bd3bca" 2017-01-09 13:14:47 +00:00
Jorim Jaggi
4083cf1e72 Merge "Fix message for screen unpinning" into nyc-mr2-dev am: b0181b634e
am: 0cf4bd3bca

Change-Id: I3b4291efeb7af34a99f016b9568d2cdee76cda87
2017-01-09 13:14:01 +00:00
Android Build Merger (Role)
8572eecade Merge "Fix message for screen unpinning am: 8a28aa54c7 am: d4fa48aeb4" 2017-01-09 13:13:38 +00:00
Jerome Gaillard
63389daeed Merge "Update layoulib following changes in Android source code" 2017-01-09 13:12:52 +00:00
Jorim Jaggi
59b8df7bd8 Fix message for screen unpinning am: 8a28aa54c7
am: d4fa48aeb4

Change-Id: I89a2c55a807a57ffcdc547b14b148705e6a49d32
2017-01-09 13:12:49 +00:00
Jorim Jaggi
0cf4bd3bca Merge "Fix message for screen unpinning" into nyc-mr2-dev
am: b0181b634e

Change-Id: I602c24f1e873386afa6680ab23ed3176463a5f6c
2017-01-09 13:02:51 +00:00
Jorim Jaggi
d4fa48aeb4 Fix message for screen unpinning
am: 8a28aa54c7

Change-Id: I07d9882251d7de35f785469b13164fd39bce5266
2017-01-09 13:02:44 +00:00
Jorim Jaggi
b0181b634e Merge "Fix message for screen unpinning" into nyc-mr2-dev 2017-01-09 12:52:51 +00:00
Przemyslaw Szczepaniak
0ec8a24a94 Merge "Track libcore/jsr-166 update" am: f6f36d7d9a am: 44cc1f23bf am: b9f1b72cb3
am: ec12e28c82

Change-Id: I9938ed2a97f60a7234ad88be60de835ccd1671f6
2017-01-09 11:31:17 +00:00
Przemyslaw Szczepaniak
ec12e28c82 Merge "Track libcore/jsr-166 update" am: f6f36d7d9a am: 44cc1f23bf
am: b9f1b72cb3

Change-Id: I003d0c134c813e06b81922c5fd044d05e7891d38
2017-01-09 11:26:12 +00:00
Przemyslaw Szczepaniak
b9f1b72cb3 Merge "Track libcore/jsr-166 update" am: f6f36d7d9a
am: 44cc1f23bf

Change-Id: Ic9537f84f8210960c98d64891f1267f017186763
2017-01-09 11:21:46 +00:00
Przemyslaw Szczepaniak
44cc1f23bf Merge "Track libcore/jsr-166 update"
am: f6f36d7d9a

Change-Id: I6ba30b86fa45403631233ede5994eac0748d9b37
2017-01-09 11:17:06 +00:00
Charles He
31df867f7e Merge "Update SystemUpdatePolicy javadoc." 2017-01-09 11:09:58 +00:00
Przemyslaw Szczepaniak
f6f36d7d9a Merge "Track libcore/jsr-166 update" 2017-01-09 11:08:35 +00:00
Przemyslaw Szczepaniak
9e63cc2a08 Track libcore/jsr-166 update
No functional changes.

Update after the switch from custom to openJdk-based implementation of
java.util.concurrent.CopyOnWriteArrayList class.
Tracks libcore commit 29957558cf0db700bfaae360a80c42dc3871d0e5.

Test: make -j 32
Bug: 30860904
Change-Id: I4435bc1fb5ef9fc4ee5f882370073ba8ce2bcfba
2017-01-09 10:49:49 +00:00
Amin Shaikh
5ac6650d4a Expose fields in WifiConfiguration.
hasNoInternetAccess and isNoInternetAccessExpected are key signals needed
to determine whether Wi-Fi should be woken up for a given saved network.

Test: make
Bug: 33224312
Change-Id: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
2017-01-08 22:29:51 -08:00
Nick Kralevich
8ae761f703 Merge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87 am: a63462c794
am: 4429993d78  -s ours

Change-Id: I541b8ec5085dd0a1a78337f57d155aa0ff0d3b68
2017-01-08 15:28:02 +00:00
Nick Kralevich
4429993d78 Merge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87
am: a63462c794

Change-Id: I2a62442a581d89054421dd6c44c610fb7ee9a0c4
2017-01-08 15:09:21 +00:00
Nick Kralevich
a63462c794 Merge "Dumps total size of primary storage." am: 55dc66dde4
am: 12b387dd87

Change-Id: I08e98467d212a7f9ec01b16a46540bc3d059ee51
2017-01-08 15:04:54 +00:00
Nick Kralevich
12b387dd87 Merge "Dumps total size of primary storage."
am: 55dc66dde4

Change-Id: Ifc3537d3aeda5e6eb3b1c003a4eaf392d07bcf86
2017-01-08 15:00:18 +00:00
Nick Kralevich
55dc66dde4 Merge "Dumps total size of primary storage." 2017-01-08 14:53:09 +00:00
Peter Qiu
589fe00655 Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52 am: 5549acb0e6
am: fc9579cfda

Change-Id: I5d9166a297b1fdb16d14fcd7eb83866e1be5606a
2017-01-08 10:05:27 +00:00
Peter Qiu
fc9579cfda Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52
am: 5549acb0e6

Change-Id: I202a51c7d32ecf747fcc32597ac574b5faac2037
2017-01-08 07:14:30 +00:00
Peter Qiu
5549acb0e6 Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5
am: fdbc827a52

Change-Id: Ifaf73023a932b2866ed3da1d81abeed920e8427b
2017-01-08 07:06:20 +00:00
Peter Qiu
fdbc827a52 Merge "wifi: hotspot2: Passpoint configuration APIs update"
am: b1c9bc5ea5

Change-Id: I47d8e12fbb7bc3faefabbed02b7235396eb6dbe5
2017-01-08 07:00:57 +00:00