OSDN Git Service

android-x86/frameworks-base.git
7 years agoCheck visible paths as well when generate docId from file system path.
Garfield Tan [Tue, 10 Jan 2017 02:04:43 +0000 (18:04 -0800)]
Check visible paths as well when generate docId from file system path.

getDocumentUri(String, List<UriPermission>) needs it because MediaStore
can only provide path under visible paths for external SD cards.

Test: Manual test w/ SD card. Relative CTS tests pass. Happy to add
automated tests for SD card cases if somebody shows me how.

Bug: 33819522
Change-Id: I15cdd60a2d2c94275dd661f20b5b0deb0d80d258

7 years agoMerge "Updating PIP to match UX"
TreeHugger Robot [Mon, 9 Jan 2017 19:33:03 +0000 (19:33 +0000)]
Merge "Updating PIP to match UX"

7 years agoMerge "Allow CommandQueue to have multiple callbacks"
TreeHugger Robot [Mon, 9 Jan 2017 19:11:03 +0000 (19:11 +0000)]
Merge "Allow CommandQueue to have multiple callbacks"

7 years agoMerge "AAPT: Dump maxSdkVersion for implicit permissions"
Adam Lesinski [Mon, 9 Jan 2017 18:56:03 +0000 (18:56 +0000)]
Merge "AAPT: Dump maxSdkVersion for implicit permissions"

7 years agoMerge "Create a new jank test to measure HW layer resize performance"
TreeHugger Robot [Mon, 9 Jan 2017 18:50:51 +0000 (18:50 +0000)]
Merge "Create a new jank test to measure HW layer resize performance"

7 years agoMerge "Expose WifiManager#connect and ActionListener as @SystemApi"
TreeHugger Robot [Mon, 9 Jan 2017 18:46:11 +0000 (18:46 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"

7 years agoMerge "Expose fields in WifiConfiguration."
TreeHugger Robot [Mon, 9 Jan 2017 18:39:30 +0000 (18:39 +0000)]
Merge "Expose fields in WifiConfiguration."

7 years agoMerge "Add @Nullable to CompoundButton#setOnCheckedChangeListener()."
TreeHugger Robot [Mon, 9 Jan 2017 18:33:40 +0000 (18:33 +0000)]
Merge "Add @Nullable to CompoundButton#setOnCheckedChangeListener()."

7 years agoMerge "Fix NPE in RenderNodeAnimator ALPHA when used outside ViewPropertyAnimator"
Chris Craik [Mon, 9 Jan 2017 18:15:30 +0000 (18:15 +0000)]
Merge "Fix NPE in RenderNodeAnimator ALPHA when used outside ViewPropertyAnimator"

7 years agoMerge "Do not try to resolve realpath in DexManager."
Calin Juravle [Mon, 9 Jan 2017 18:12:14 +0000 (18:12 +0000)]
Merge "Do not try to resolve realpath in DexManager."

7 years agoMerge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev am: b100a9ac58
Jiaquan He [Mon, 9 Jan 2017 18:09:02 +0000 (18:09 +0000)]
Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev am: b100a9ac58
am: 78f5430f35

Change-Id: I8887f47b9647841a58d2399c699f0433ad1189c7

7 years agoForce Grid-based Recents to show at most 8 tasks. am: 883887eac9
Jiaquan He [Mon, 9 Jan 2017 18:08:03 +0000 (18:08 +0000)]
Force Grid-based Recents to show at most 8 tasks. am: 883887eac9
am: e1aee8bc8c

Change-Id: I3c231912c7be65768e8ade869203bfdc3c155624

7 years agoMerge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev
Jiaquan He [Mon, 9 Jan 2017 18:03:41 +0000 (18:03 +0000)]
Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev
am: b100a9ac58

Change-Id: I74d039468db01cf1018ab397b94f70b1d517432b

7 years agoForce Grid-based Recents to show at most 8 tasks.
Jiaquan He [Mon, 9 Jan 2017 18:03:34 +0000 (18:03 +0000)]
Force Grid-based Recents to show at most 8 tasks.
am: 883887eac9

Change-Id: I3960939f61acd8834101767481e5cafa7d9aac23

7 years agoMerge "Remove clipRegion from the public API."
Derek Sollenberger [Mon, 9 Jan 2017 18:01:47 +0000 (18:01 +0000)]
Merge "Remove clipRegion from the public API."

7 years agoMerge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev
TreeHugger Robot [Mon, 9 Jan 2017 17:56:43 +0000 (17:56 +0000)]
Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev

7 years agoAllow CommandQueue to have multiple callbacks
Jason Monk [Thu, 5 Jan 2017 16:35:34 +0000 (11:35 -0500)]
Allow CommandQueue to have multiple callbacks

Allow for multiple callbacks to be added to CommandQueue.
This will allow PhoneStatusBar to be broken up into pieces
that make more sense.

Test: runtest systemui
Change-Id: I73a7da1c23c8e45a291e5957e7341f3930abc334

7 years agoForce Grid-based Recents to show at most 8 tasks.
Jiaquan He [Fri, 6 Jan 2017 19:53:02 +0000 (11:53 -0800)]
Force Grid-based Recents to show at most 8 tasks.

Bug: 32101881
Bug: 33975969

Change-Id: Icbadaa3ca12f53e57e06dd19d7809a23e0efa88c

7 years agoMerge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844...
Alex Naidis [Mon, 9 Jan 2017 17:14:34 +0000 (17:14 +0000)]
Merge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844 am: edca8aa3a8
am: 32dfe8c611

Change-Id: I5faf99bd2b4425f1615419de43f247f78d74108b

7 years agoMerge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844
Alex Naidis [Mon, 9 Jan 2017 17:09:31 +0000 (17:09 +0000)]
Merge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844
am: edca8aa3a8

Change-Id: Idbd8b16f0825bdcf48d2013448c767d0966434fe

7 years agoMerge "StorageManager: Improve exception handling" am: cf3a4a68bd
Alex Naidis [Mon, 9 Jan 2017 17:04:32 +0000 (17:04 +0000)]
Merge "StorageManager: Improve exception handling" am: cf3a4a68bd
am: 545cf37844

Change-Id: I452e3fcbda9cfa24db5b2bfdd077b7e5a7b241b4

7 years agoMerge "StorageManager: Improve exception handling"
Alex Naidis [Mon, 9 Jan 2017 16:59:56 +0000 (16:59 +0000)]
Merge "StorageManager: Improve exception handling"
am: cf3a4a68bd

Change-Id: Id421cb483655dab6d379251d983da2bdcafe598d

7 years agoMerge "Do not call RecoverySystem with DPMS lock held"
Makoto Onuki [Mon, 9 Jan 2017 16:53:06 +0000 (16:53 +0000)]
Merge "Do not call RecoverySystem with DPMS lock held"

7 years agoMerge "StorageManager: Improve exception handling"
Treehugger Robot [Mon, 9 Jan 2017 16:48:35 +0000 (16:48 +0000)]
Merge "StorageManager: Improve exception handling"

7 years agoMerge "Log wrapper for multi-metrics in tron."
Alison Cichowlas [Mon, 9 Jan 2017 16:39:01 +0000 (16:39 +0000)]
Merge "Log wrapper for multi-metrics in tron."

7 years agoStorageManager: Improve exception handling
Alex Naidis [Wed, 4 Jan 2017 17:52:36 +0000 (18:52 +0100)]
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>
7 years agoMerge "Implement delegate for new native method from Bitmap"
Jerome Gaillard [Mon, 9 Jan 2017 16:07:53 +0000 (16:07 +0000)]
Merge "Implement delegate for new native method from Bitmap"

7 years agoMerge "Don't move-to-front overlays for unresumed tasks"
Robin Lee [Mon, 9 Jan 2017 16:01:54 +0000 (16:01 +0000)]
Merge "Don't move-to-front overlays for unresumed tasks"

7 years agoMerge "Cannot have badge only channels"
Julia Reynolds [Mon, 9 Jan 2017 14:59:47 +0000 (14:59 +0000)]
Merge "Cannot have badge only channels"

7 years agoImplement delegate for new native method from Bitmap
Jerome Gaillard [Wed, 4 Jan 2017 19:12:02 +0000 (19:12 +0000)]
Implement delegate for new native method from Bitmap

The method Bitmap.nativeCopyPreserveInternalConfig was introduced by
Change Ic128dfed.

Test: Run layoutlib tests
Change-Id: I13da7deece9eb1d0d3e6a42203522fcf0b332ba9

7 years agoMerge "Merge "Fix message for screen unpinning" into nyc-mr2-dev am: b0181b634e am...
Android Build Merger (Role) [Mon, 9 Jan 2017 13:14:44 +0000 (13:14 +0000)]
Merge "Merge "Fix message for screen unpinning" into nyc-mr2-dev am: b0181b634e am: 0cf4bd3bca"

7 years agoMerge "Fix message for screen unpinning" into nyc-mr2-dev am: b0181b634e
Jorim Jaggi [Mon, 9 Jan 2017 13:14:01 +0000 (13:14 +0000)]
Merge "Fix message for screen unpinning" into nyc-mr2-dev am: b0181b634e
am: 0cf4bd3bca

Change-Id: I3b4291efeb7af34a99f016b9568d2cdee76cda87

7 years agoMerge "Fix message for screen unpinning am: 8a28aa54c7 am: d4fa48aeb4"
Android Build Merger (Role) [Mon, 9 Jan 2017 13:13:35 +0000 (13:13 +0000)]
Merge "Fix message for screen unpinning am: 8a28aa54c7 am: d4fa48aeb4"

7 years agoMerge "Update layoulib following changes in Android source code"
Jerome Gaillard [Mon, 9 Jan 2017 13:12:48 +0000 (13:12 +0000)]
Merge "Update layoulib following changes in Android source code"

7 years agoFix message for screen unpinning am: 8a28aa54c7
Jorim Jaggi [Mon, 9 Jan 2017 13:12:49 +0000 (13:12 +0000)]
Fix message for screen unpinning am: 8a28aa54c7
am: d4fa48aeb4

Change-Id: I89a2c55a807a57ffcdc547b14b148705e6a49d32

7 years agoMerge "Fix message for screen unpinning" into nyc-mr2-dev
Jorim Jaggi [Mon, 9 Jan 2017 13:02:51 +0000 (13:02 +0000)]
Merge "Fix message for screen unpinning" into nyc-mr2-dev
am: b0181b634e

Change-Id: I602c24f1e873386afa6680ab23ed3176463a5f6c

7 years agoFix message for screen unpinning
Jorim Jaggi [Mon, 9 Jan 2017 13:02:44 +0000 (13:02 +0000)]
Fix message for screen unpinning
am: 8a28aa54c7

Change-Id: I07d9882251d7de35f785469b13164fd39bce5266

7 years agoMerge "Fix message for screen unpinning" into nyc-mr2-dev
Jorim Jaggi [Mon, 9 Jan 2017 12:52:47 +0000 (12:52 +0000)]
Merge "Fix message for screen unpinning" into nyc-mr2-dev

7 years agoMerge "Track libcore/jsr-166 update" am: f6f36d7d9a am: 44cc1f23bf am: b9f1b72cb3
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:31:17 +0000 (11:31 +0000)]
Merge "Track libcore/jsr-166 update" am: f6f36d7d9a am: 44cc1f23bf am: b9f1b72cb3
am: ec12e28c82

Change-Id: I9938ed2a97f60a7234ad88be60de835ccd1671f6

7 years agoMerge "Track libcore/jsr-166 update" am: f6f36d7d9a am: 44cc1f23bf
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:26:12 +0000 (11:26 +0000)]
Merge "Track libcore/jsr-166 update" am: f6f36d7d9a am: 44cc1f23bf
am: b9f1b72cb3

Change-Id: I003d0c134c813e06b81922c5fd044d05e7891d38

7 years agoMerge "Track libcore/jsr-166 update" am: f6f36d7d9a
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:21:46 +0000 (11:21 +0000)]
Merge "Track libcore/jsr-166 update" am: f6f36d7d9a
am: 44cc1f23bf

Change-Id: Ic9537f84f8210960c98d64891f1267f017186763

7 years agoMerge "Track libcore/jsr-166 update"
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:17:06 +0000 (11:17 +0000)]
Merge "Track libcore/jsr-166 update"
am: f6f36d7d9a

Change-Id: I6ba30b86fa45403631233ede5994eac0748d9b37

7 years agoMerge "Update SystemUpdatePolicy javadoc."
Charles He [Mon, 9 Jan 2017 11:09:53 +0000 (11:09 +0000)]
Merge "Update SystemUpdatePolicy javadoc."

7 years agoMerge "Track libcore/jsr-166 update"
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:08:34 +0000 (11:08 +0000)]
Merge "Track libcore/jsr-166 update"

7 years agoTrack libcore/jsr-166 update
Przemyslaw Szczepaniak [Thu, 29 Dec 2016 14:28:51 +0000 (14:28 +0000)]
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

7 years agoExpose fields in WifiConfiguration.
Amin Shaikh [Fri, 6 Jan 2017 18:00:33 +0000 (10:00 -0800)]
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

7 years agoMerge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87 am: a63462c794
Nick Kralevich [Sun, 8 Jan 2017 15:28:02 +0000 (15:28 +0000)]
Merge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87 am: a63462c794
am: 4429993d78  -s ours

Change-Id: I541b8ec5085dd0a1a78337f57d155aa0ff0d3b68

7 years agoMerge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87
Nick Kralevich [Sun, 8 Jan 2017 15:09:21 +0000 (15:09 +0000)]
Merge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87
am: a63462c794

Change-Id: I2a62442a581d89054421dd6c44c610fb7ee9a0c4

7 years agoMerge "Dumps total size of primary storage." am: 55dc66dde4
Nick Kralevich [Sun, 8 Jan 2017 15:04:54 +0000 (15:04 +0000)]
Merge "Dumps total size of primary storage." am: 55dc66dde4
am: 12b387dd87

Change-Id: I08e98467d212a7f9ec01b16a46540bc3d059ee51

7 years agoMerge "Dumps total size of primary storage."
Nick Kralevich [Sun, 8 Jan 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Dumps total size of primary storage."
am: 55dc66dde4

Change-Id: Ifc3537d3aeda5e6eb3b1c003a4eaf392d07bcf86

7 years agoMerge "Dumps total size of primary storage."
Nick Kralevich [Sun, 8 Jan 2017 14:53:08 +0000 (14:53 +0000)]
Merge "Dumps total size of primary storage."

7 years agoMerge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc82...
Peter Qiu [Sun, 8 Jan 2017 10:05:27 +0000 (10:05 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52 am: 5549acb0e6
am: fc9579cfda

Change-Id: I5d9166a297b1fdb16d14fcd7eb83866e1be5606a

7 years agoMerge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52
Peter Qiu [Sun, 8 Jan 2017 07:14:30 +0000 (07:14 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52
am: 5549acb0e6

Change-Id: I202a51c7d32ecf747fcc32597ac574b5faac2037

7 years agoMerge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5
Peter Qiu [Sun, 8 Jan 2017 07:06:20 +0000 (07:06 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5
am: fdbc827a52

Change-Id: Ifaf73023a932b2866ed3da1d81abeed920e8427b

7 years agoMerge "wifi: hotspot2: Passpoint configuration APIs update"
Peter Qiu [Sun, 8 Jan 2017 07:00:57 +0000 (07:00 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update"
am: b1c9bc5ea5

Change-Id: I47d8e12fbb7bc3faefabbed02b7235396eb6dbe5

7 years agoMerge "wifi: hotspot2: Passpoint configuration APIs update"
Treehugger Robot [Sun, 8 Jan 2017 06:51:51 +0000 (06:51 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update"

7 years agoDumps total size of primary storage.
Felipe Leme [Tue, 11 Oct 2016 00:12:20 +0000 (17:12 -0700)]
Dumps total size of primary storage.

BUG: 32069168
Test: manual verification

(cherry picked from commit 281389ac5475e483d10a2e8aa31195b9e9875246)

Change-Id: If5dee52a99c03a00dada22736c09d953dc0b66d1

7 years agoMerge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6cc...
Etan Cohen [Sat, 7 Jan 2017 20:34:49 +0000 (20:34 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd am: dce01e235b am: baf9bb8563
am: 8bad14363e

Change-Id: I545524b640fc1fbef547b0006fa6288bc45be7c1

7 years agoMerge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6cc...
Etan Cohen [Sat, 7 Jan 2017 20:26:19 +0000 (20:26 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd am: dce01e235b
am: baf9bb8563

Change-Id: I96c804fe006cfefb0b635f88a0f8d0e185576c3b

7 years agoMerge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd
Etan Cohen [Sat, 7 Jan 2017 20:18:23 +0000 (20:18 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd
am: dce01e235b

Change-Id: I0e693ff19f8c08212c4daadebc3b6af33e239eda

7 years agoMerge "[AWARE] Remove reason from discovery session terminate callback"
Etan Cohen [Sat, 7 Jan 2017 20:13:33 +0000 (20:13 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback"
am: bbbe5e6ccd

Change-Id: Iede092421659c5ae55475f153d940d97dac6b7b0

7 years agoMerge "[AWARE] Remove reason from discovery session terminate callback"
Etan Cohen [Sat, 7 Jan 2017 20:05:37 +0000 (20:05 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback"

7 years agoMerge "Make metadata field mandatory for program info struct."
Tomasz Wasilczyk [Sat, 7 Jan 2017 20:03:40 +0000 (20:03 +0000)]
Merge "Make metadata field mandatory for program info struct."

7 years agoMerge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472...
Etan Cohen [Sat, 7 Jan 2017 18:48:10 +0000 (18:48 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472 am: 0bad91b5ac
am: 0232d18805

Change-Id: Ibdb559206159eb840810f55f51545cdc797d16d6

7 years agoMerge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472
Etan Cohen [Sat, 7 Jan 2017 18:38:08 +0000 (18:38 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472
am: 0bad91b5ac

Change-Id: I10da8332166d94c543ea94519af702961d3a429c

7 years agoMerge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525
Etan Cohen [Sat, 7 Jan 2017 18:29:13 +0000 (18:29 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525
am: fd23421472

Change-Id: I6ba8709fcce9e68b85811959400c5240e2a2bb36

7 years agoMerge "[AWARE] Simplify Wi-Fi Aware API namespace"
Etan Cohen [Sat, 7 Jan 2017 18:20:31 +0000 (18:20 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace"
am: 834a87d525

Change-Id: I243194a658ee8e9c5a21301601a473149eaa8a2f

7 years agoMerge "[AWARE] Simplify Wi-Fi Aware API namespace"
Etan Cohen [Sat, 7 Jan 2017 18:12:33 +0000 (18:12 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace"

7 years agoMerge "Initial API shape for storage statistics."
Jeff Sharkey [Sat, 7 Jan 2017 16:18:35 +0000 (16:18 +0000)]
Merge "Initial API shape for storage statistics."

7 years agoMerge "Moved implicit intents into explicit intents"
TreeHugger Robot [Sat, 7 Jan 2017 06:02:27 +0000 (06:02 +0000)]
Merge "Moved implicit intents into explicit intents"

7 years agoMoved implicit intents into explicit intents
Jack Yu [Thu, 5 Jan 2017 23:19:31 +0000 (15:19 -0800)]
Moved implicit intents into explicit intents

Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e

7 years agoMerge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am...
David Friedman [Sat, 7 Jan 2017 03:11:43 +0000 (03:11 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9" into nyc-mr2-dev-plus-aosp
am: cea9b99099

Change-Id: I8a6e872a2d6419e1bb343eb3aeb3967d82d73031

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f88582...
David Friedman [Sat, 7 Jan 2017 03:11:35 +0000 (03:11 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9
am: 7583234ece

Change-Id: I7bf139f6cadf547259122ef4505c64f477b27420

7 years agoMerge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am...
David Friedman [Sat, 7 Jan 2017 03:10:06 +0000 (03:10 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed" into nyc-mr2-dev-plus-aosp
am: b5aaead225

Change-Id: Ia9b3c5d768ff09d2723abe3b98d8a4bcdc2f2a40

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f88582...
David Friedman [Sat, 7 Jan 2017 03:09:56 +0000 (03:09 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed
am: fa57c1c713

Change-Id: If3934a12c75bd88850aa87b068fb430df8d7815d

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a...
Dave Friedman [Sat, 7 Jan 2017 03:08:20 +0000 (03:08 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4" into nyc-mr2-dev-plus-aosp
am: b07a52ee91

Change-Id: I6f89296178074412c3827da700d24c67ada5641e

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b...
Dave Friedman [Sat, 7 Jan 2017 03:08:12 +0000 (03:08 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4
am: 696f17fff2

Change-Id: I072533052cf5ce78f89defb889fd0e1b11710399

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b...
Dave Friedman [Sat, 7 Jan 2017 03:06:54 +0000 (03:06 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: fb8676e50c
am: 5346355f4d

Change-Id: I67559350187089b64f0ce092c1f6ae8e7a52542e

7 years agoMerge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am...
Android Build Merger (Role) [Sat, 7 Jan 2017 03:00:18 +0000 (03:00 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: a303af44f9" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am...
Android Build Merger (Role) [Sat, 7 Jan 2017 02:59:53 +0000 (02:59 +0000)]
Merge "Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda am: b6092f5aed" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f88582...
David Friedman [Sat, 7 Jan 2017 02:59:33 +0000 (02:59 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda
am: a303af44f9

Change-Id: I8a5a979b7a037f4c010e25393f2fe7a74a4fee5f

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f88582...
David Friedman [Sat, 7 Jan 2017 02:59:13 +0000 (02:59 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca am: d8e95f6bda
am: b6092f5aed

Change-Id: I388b5c7e19a4ca6333be82136c33df3a2731b3f0

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a...
Android Build Merger (Role) [Sat, 7 Jan 2017 02:59:06 +0000 (02:59 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579 am: 89f96e8fa4" into nyc-mr2-dev-plus-aosp

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b...
Dave Friedman [Sat, 7 Jan 2017 02:58:22 +0000 (02:58 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579
am: 89f96e8fa4

Change-Id: Iba9639fe928c6201a574dc1b9cdfb5247ab72439

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b...
Dave Friedman [Sat, 7 Jan 2017 02:58:15 +0000 (02:58 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579
am: fb8676e50c

Change-Id: I5b13dcbab3aed19c805473a6ab91eef197ded51d

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f88582...
David Friedman [Sat, 7 Jan 2017 02:51:16 +0000 (02:51 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca
am: d8e95f6bda

Change-Id: I1638d0b407db1a990b0c32f3cb14344f524ba8a4

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f88582...
David Friedman [Sat, 7 Jan 2017 02:51:15 +0000 (02:51 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca
am: d8e95f6bda

Change-Id: I566c5345fee98650766f31af2c5723d8b423fbd5

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b...
Dave Friedman [Sat, 7 Jan 2017 02:50:18 +0000 (02:50 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0
am: eedb695579

Change-Id: Ia5922ed50290cc8f47d07f1516bc5a21b0bec270

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b...
Dave Friedman [Sat, 7 Jan 2017 02:50:17 +0000 (02:50 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0
am: eedb695579

Change-Id: Icd2ded633cf7211ef9d1a2106216450db7773408

7 years agoMerge "Make REQUEST_NETWORK_SCORES signature only."
TreeHugger Robot [Sat, 7 Jan 2017 02:49:08 +0000 (02:49 +0000)]
Merge "Make REQUEST_NETWORK_SCORES signature only."

7 years agoMerge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
TreeHugger Robot [Sat, 7 Jan 2017 02:48:41 +0000 (02:48 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f88582...
David Friedman [Sat, 7 Jan 2017 02:46:33 +0000 (02:46 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266
am: bcc449eeca

Change-Id: I070f5c7088ce237995f995c2aa097e1f04cc4000

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b
Dave Friedman [Sat, 7 Jan 2017 02:43:44 +0000 (02:43 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b
am: a111e0f7f0

Change-Id: Ic5d7e0ce01bd573e0882122d0709cbc2da56f448

7 years agoMerge "Implement Account Discovery API."
Dmitry Dementyev [Sat, 7 Jan 2017 02:41:41 +0000 (02:41 +0000)]
Merge "Implement Account Discovery API."

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826
David Friedman [Sat, 7 Jan 2017 02:39:33 +0000 (02:39 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826
am: c3b564e266

Change-Id: I23fdc92b08e32c643de8009bebf4e02c41741c7e

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe
Dave Friedman [Sat, 7 Jan 2017 02:38:45 +0000 (02:38 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe
am: e0fd4c8a3b

Change-Id: I8f65ad71433efbe1121e0617c6d7575b7db3a051

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
David Friedman [Sat, 7 Jan 2017 02:30:48 +0000 (02:30 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
am: 101f885826

Change-Id: I5e6d948373c8f8ff2892c843329a7d2b540b8706

7 years agoDocs: Updates Javadoc documentation. Bug: 32532540
Dave Friedman [Sat, 7 Jan 2017 02:30:45 +0000 (02:30 +0000)]
Docs: Updates Javadoc documentation. Bug: 32532540
am: 2a3ebadcbe

Change-Id: Ibee55c5e73d9b51e5f5df24be01b0b797fa8a7a5

7 years agoMerge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev
David Friedman [Sat, 7 Jan 2017 02:24:54 +0000 (02:24 +0000)]
Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev

7 years agoMerge "libandroidfw: Revert null check in ApplyStyle"
TreeHugger Robot [Sat, 7 Jan 2017 02:20:14 +0000 (02:20 +0000)]
Merge "libandroidfw: Revert null check in ApplyStyle"