OSDN Git Service
Eino-Ville Talvala [Mon, 18 Jul 2016 21:30:30 +0000 (21:30 +0000)]
Merge \"CameraMetadata JNI: Move tag lookup to common utility code\" into nyc-mr1-dev
am:
ff080be098
Change-Id: Ica003bc034d6e0a741c2dda3e7c3bfc5756ce2cf
Eino-Ville Talvala [Mon, 18 Jul 2016 21:25:35 +0000 (21:25 +0000)]
Merge "CameraMetadata JNI: Move tag lookup to common utility code" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 21:25:15 +0000 (21:25 +0000)]
Merge "Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am:
142d1214d0 am:
507c9165d1" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Mon, 18 Jul 2016 21:24:52 +0000 (21:24 +0000)]
Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am:
142d1214d0
am:
507c9165d1
Change-Id: I2d01fdf589bd3492cfdcd28f5410c95dd3ea7fd2
Andrew Solovay [Mon, 18 Jul 2016 21:24:30 +0000 (21:24 +0000)]
Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am:
142d1214d0
am:
74171f88c2
Change-Id: I281ca582bc2461e8e099e731cd6126e7bddf0b16
Andrew Solovay [Mon, 18 Jul 2016 21:15:53 +0000 (21:15 +0000)]
Merge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
am:
142d1214d0
Change-Id: I565e615e575eed25ae2957fbaf7de72b97541739
Adam Lesinski [Mon, 18 Jul 2016 21:15:48 +0000 (21:15 +0000)]
Merge \"Record UID of wakeup packets\" into nyc-mr1-dev
am:
117cf8de91
Change-Id: Id4e843eef00a623353fe3027de13460aa92e699f
Andrew Solovay [Mon, 18 Jul 2016 21:15:20 +0000 (21:15 +0000)]
Merge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
am:
142d1214d0
Change-Id: I6344b9fc5f70f6f02bcc5044bb40e42bda3433b8
Jim Miller [Mon, 18 Jul 2016 21:09:37 +0000 (21:09 +0000)]
Merge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev
am:
6ad9c16ffd
Change-Id: Id4db555de3df2d73046aa6358e6b559f4529890d
TreeHugger Robot [Mon, 18 Jul 2016 21:07:34 +0000 (21:07 +0000)]
Merge "docs: Late-breaking updates to DP5 release notes" into nyc-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:58:13 +0000 (20:58 +0000)]
Merge "Record UID of wakeup packets" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:54:44 +0000 (20:54 +0000)]
Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev
Tyler Gunn [Mon, 18 Jul 2016 20:24:37 +0000 (20:24 +0000)]
Merge \"Enhance toString on ConferenceParticipant.\" into nyc-mr1-dev
am:
b822f7a956
Change-Id: I7b6b1a94fd04b22755cba511b674f128ee63260b
Tyler Gunn [Mon, 18 Jul 2016 20:13:31 +0000 (20:13 +0000)]
Merge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 20:09:07 +0000 (20:09 +0000)]
Merge "Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am:
242f5798ac am:
a5e5cf6a84" into nyc-mr1-dev-plus-aosp
Mark Lu [Mon, 18 Jul 2016 20:08:39 +0000 (20:08 +0000)]
Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am:
242f5798ac
am:
a5e5cf6a84
Change-Id: I87606bd4b170bcf8b0a76652f9da3892be524059
Mark Lu [Mon, 18 Jul 2016 20:08:37 +0000 (20:08 +0000)]
Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am:
242f5798ac
am:
f46504d95e
Change-Id: Ie98db8eaeadffa5c7a39fd08c41961a798ee8442
Mark Lu [Mon, 18 Jul 2016 19:55:28 +0000 (19:55 +0000)]
Merge \"docs: remove trailing white space from jd files\" into nyc-dev
am:
242f5798ac
Change-Id: Id3692c9293f6e41fb57188e5a7641f913c690a56
Mark Lu [Mon, 18 Jul 2016 19:55:28 +0000 (19:55 +0000)]
Merge \"docs: remove trailing white space from jd files\" into nyc-dev
am:
242f5798ac
Change-Id: I6d0c57812a6af0663f483a26aa037a85cd84838c
Mark Lu [Mon, 18 Jul 2016 19:48:50 +0000 (19:48 +0000)]
Merge "docs: remove trailing white space from jd files" into nyc-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 19:36:38 +0000 (19:36 +0000)]
Merge "Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am:
56bacea883 am:
f1172504de" into nyc-mr1-dev-plus-aosp
Scott Main [Mon, 18 Jul 2016 19:36:12 +0000 (19:36 +0000)]
Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am:
56bacea883
am:
f1172504de
Change-Id: I4c590a2bfa09e021eac40057f60e3143ce096940
Scott Main [Mon, 18 Jul 2016 19:34:49 +0000 (19:34 +0000)]
Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am:
56bacea883
am:
6e446a5f38
Change-Id: I33812f3e71fda1975e1edd6e6de48a0436c700e6
Adam Lesinski [Thu, 14 Jul 2016 23:56:08 +0000 (16:56 -0700)]
Record UID of wakeup packets
Bug:
28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73
smain@google.com [Mon, 18 Jul 2016 19:27:18 +0000 (19:27 +0000)]
Merge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\" into nyc-dev
am:
56bacea883
Change-Id: Ib620e4caf5e5a9ca9e10a0daa9dce13d6622cf61
smain@google.com [Mon, 18 Jul 2016 19:27:18 +0000 (19:27 +0000)]
Merge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\" into nyc-dev
am:
56bacea883
Change-Id: I00dbf309d7e1c79d93733e6c3aa08ec7eca41401
Scott Main [Mon, 18 Jul 2016 19:19:45 +0000 (19:19 +0000)]
Merge "add redirect for "getting started" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics" into nyc-dev
smain@google.com [Fri, 15 Jul 2016 22:25:25 +0000 (15:25 -0700)]
add redirect for "getting started" help button in Studio.
Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics
Change-Id: I914d4fac51d3cf7e839a7b5785a7c8cd43b57346
Felipe Leme [Mon, 18 Jul 2016 18:53:04 +0000 (18:53 +0000)]
Merge \"Fixed bugreport share dialog padding.\" into nyc-mr1-dev
am:
699e1bc74b
Change-Id: Ie571191e8c64569b545040665be5eca7ad35fb4e
TreeHugger Robot [Mon, 18 Jul 2016 18:37:34 +0000 (18:37 +0000)]
Merge "Fixed bugreport share dialog padding." into nyc-mr1-dev
Andrew Solovay [Mon, 18 Jul 2016 18:12:49 +0000 (11:12 -0700)]
docs: Late-breaking updates to DP5 release notes
See first comment for doc stage location.
Change-Id: Ib1ea6047d2b8d1ea9ff7e749ae380df65853b7c0
Makoto Onuki [Mon, 18 Jul 2016 18:05:40 +0000 (18:05 +0000)]
Merge \"Implement dumpsys --checkin for shortcut manager\" into nyc-mr1-dev
am:
121480cda8
Change-Id: I38508e2b47dcb2fe2e8046f7c148b4ddbf6a2697
Makoto Onuki [Mon, 18 Jul 2016 18:05:36 +0000 (18:05 +0000)]
Merge \"Remove the DMAgent whitelisting\" into nyc-mr1-dev
am:
bf6c6b44e1
Change-Id: I85b2fabd9f33697be15bccbaf8602fa525012772
Abodunrinwa Toki [Mon, 18 Jul 2016 18:05:32 +0000 (18:05 +0000)]
Merge \"DO NOT MERGE: FloatingToolbar - Check that app supports RTL.\" into nyc-mr1-dev
am:
63b31d5729
Change-Id: I77c82ad4ce15368c92041d994e10c8a44a33667c
Hall Liu [Mon, 18 Jul 2016 17:54:48 +0000 (17:54 +0000)]
Merge \"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\" into nyc-mr1-dev
am:
810ae1ec7b
Change-Id: Ic4633dcf16425445f67c9810e2b80a446b4adee4
Makoto Onuki [Mon, 18 Jul 2016 17:50:24 +0000 (17:50 +0000)]
Merge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev
Makoto Onuki [Mon, 18 Jul 2016 17:50:17 +0000 (17:50 +0000)]
Merge "Remove the DMAgent whitelisting" into nyc-mr1-dev
Abodunrinwa Toki [Mon, 18 Jul 2016 17:49:25 +0000 (17:49 +0000)]
Merge "DO NOT MERGE: FloatingToolbar - Check that app supports RTL." into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 17:44:49 +0000 (17:44 +0000)]
Merge "Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am:
872ecfb0bf\" into nyc-mr1-dev am:
c024e480ab" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 18 Jul 2016 17:44:43 +0000 (17:44 +0000)]
Merge "Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am:
872ecfb0bf am:
965c66b41b" into nyc-mr1-dev-plus-aosp
Hall Liu [Mon, 18 Jul 2016 17:44:38 +0000 (17:44 +0000)]
Merge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev
Andrew Solovay [Mon, 18 Jul 2016 17:44:21 +0000 (17:44 +0000)]
Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am:
872ecfb0bf
am:
965c66b41b
Change-Id: I510d983c9f84e2679f1237566396cdf93e85890a
Andrew Solovay [Mon, 18 Jul 2016 17:44:12 +0000 (17:44 +0000)]
Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am:
872ecfb0bf\" into nyc-mr1-dev
am:
c024e480ab
Change-Id: I3d46dd6d160fb23702db36b5ce9090d8a6b32b6e
Christopher Tate [Mon, 18 Jul 2016 17:44:04 +0000 (17:44 +0000)]
Merge \"Document that WallpaperManager.getDrawable() can return null\" into nyc-mr1-dev
am:
3cec9d44b3
Change-Id: I72443aa4360cb4c22c9b4faf0cf98b395097757f
Mark Lu [Mon, 18 Jul 2016 17:42:11 +0000 (10:42 -0700)]
docs: remove trailing white space from jd files
Change-Id: Id7fb958460bf2f28d88c6120df0395690f32783a
Andrew Solovay [Mon, 18 Jul 2016 17:37:22 +0000 (17:37 +0000)]
Merge \"docs: Added support library 24.1.0\" into nyc-dev
am:
872ecfb0bf
Change-Id: Ibfcaf05e0bcc73c5c8b1d096553d2a9e042d7300
Android Build Merger (Role) [Mon, 18 Jul 2016 17:29:41 +0000 (17:29 +0000)]
Merge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am:
872ecfb0bf" into nyc-mr1-dev
Chris Tate [Mon, 18 Jul 2016 17:29:37 +0000 (17:29 +0000)]
Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev
Andrew Solovay [Mon, 18 Jul 2016 17:29:02 +0000 (17:29 +0000)]
Merge \"docs: Added support library 24.1.0\" into nyc-dev
am:
872ecfb0bf
Change-Id: I6ba46b8efcc8567d6192ac274e08ed1489cb0c2e
Andrew Solovay [Mon, 18 Jul 2016 17:16:59 +0000 (17:16 +0000)]
Merge "docs: Added support library 24.1.0" into nyc-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 15:28:33 +0000 (15:28 +0000)]
Merge "Doc change: updated issues in DP5 release notes. am:
73b700404c am:
142c4f7a9f" into nyc-mr1-dev-plus-aosp
Dirk Dougherty [Mon, 18 Jul 2016 15:28:03 +0000 (15:28 +0000)]
Doc change: updated issues in DP5 release notes. am:
73b700404c
am:
142c4f7a9f
Change-Id: I13a07cd7b525f5bb1fa1f599f0f3ec0ebaa57296
Dirk Dougherty [Mon, 18 Jul 2016 15:26:50 +0000 (15:26 +0000)]
Doc change: updated issues in DP5 release notes. am:
73b700404c
am:
3061ceaf82
Change-Id: Ib4be8ed685e72f4eef343958e543e1419ba8ced6
Dirk Dougherty [Mon, 18 Jul 2016 15:21:38 +0000 (15:21 +0000)]
Doc change: updated issues in DP5 release notes.
am:
73b700404c
Change-Id: Ia4cf47f5fc268d50cc30d7cfc6c990fb1f5eefec
Dirk Dougherty [Mon, 18 Jul 2016 15:21:11 +0000 (15:21 +0000)]
Doc change: updated issues in DP5 release notes.
am:
73b700404c
Change-Id: Id7bb33217a91f0e37497c83c6e4efbce8743df8b
Android Build Merger (Role) [Mon, 18 Jul 2016 15:16:21 +0000 (15:16 +0000)]
Merge "Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am:
6623f4177c am:
e8c3590a77" into nyc-mr1-dev-plus-aosp
Scott Main [Mon, 18 Jul 2016 15:15:50 +0000 (15:15 +0000)]
Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am:
6623f4177c
am:
e8c3590a77
Change-Id: I69c3100afecb4a545f71bb9a3c28f9580b18ca89
Scott Main [Mon, 18 Jul 2016 15:15:14 +0000 (15:15 +0000)]
Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am:
6623f4177c
am:
38b71c5741
Change-Id: Ice045bb360e2de70af6cc3cc721d6ec5f55e8f58
Android Build Merger (Role) [Mon, 18 Jul 2016 15:09:44 +0000 (15:09 +0000)]
Merge "Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am:
e92ebf666e\" into nyc-mr1-dev am:
838542a660" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 18 Jul 2016 15:09:29 +0000 (15:09 +0000)]
Merge "Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev am:
b5239329b1" into nyc-mr1-dev-plus-aosp
Dirk Dougherty [Mon, 18 Jul 2016 15:09:24 +0000 (08:09 -0700)]
Doc change: updated issues in DP5 release notes.
Change-Id: I8c5af9a9523be71451a23bbac9b34da5079dbc27
Dirk Dougherty [Mon, 18 Jul 2016 15:09:05 +0000 (15:09 +0000)]
Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am:
e92ebf666e\" into nyc-mr1-dev
am:
838542a660
Change-Id: Ic79c889b404ea1c576b8f50431e2774dc8b2de12
Lorenzo Colitti [Mon, 18 Jul 2016 15:08:54 +0000 (15:08 +0000)]
Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev
am:
b5239329b1
Change-Id: Ib712c3c7b44d3a623d5f5facf0c7f6844c3ebb82
Dirk Dougherty [Mon, 18 Jul 2016 15:08:30 +0000 (15:08 +0000)]
Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am:
e92ebf666e
am:
edf16d6d4b
Change-Id: I46312fed717840506111bde4be9d6ae1dc239caa
smain@google.com [Mon, 18 Jul 2016 15:08:13 +0000 (15:08 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am:
6623f4177c
Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8
smain@google.com [Mon, 18 Jul 2016 15:07:55 +0000 (15:07 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am:
6623f4177c
Change-Id: I60626863804f787bf5e1435003d730427f1254df
Android Build Merger (Role) [Mon, 18 Jul 2016 15:03:02 +0000 (15:03 +0000)]
Merge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am:
e92ebf666e" into nyc-mr1-dev
Dirk Dougherty [Mon, 18 Jul 2016 15:02:29 +0000 (15:02 +0000)]
Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev
am:
e92ebf666e
Change-Id: I7df3eb17a67a1ddc2019644d1efadacb149dcf48
Dirk Dougherty [Mon, 18 Jul 2016 15:02:28 +0000 (15:02 +0000)]
Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev
am:
e92ebf666e
Change-Id: I1396a1e544c31308bbe33ca525bace7640edbd3f
Alan Viverette [Mon, 18 Jul 2016 15:02:13 +0000 (15:02 +0000)]
Merge \"Use \"real\" display size for computing available densities\" into nyc-mr1-dev
am:
ad126d3b8b
Change-Id: Ib4641e6577dbae1bbe5a4215dd2b1d947399a1c9
TreeHugger Robot [Mon, 18 Jul 2016 15:00:20 +0000 (15:00 +0000)]
Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev
Scott Main [Mon, 18 Jul 2016 14:57:37 +0000 (14:57 +0000)]
Merge "update the version number used in docs and update the offline docs landing page" into nyc-dev
TreeHugger Robot [Mon, 18 Jul 2016 14:53:55 +0000 (14:53 +0000)]
Merge "Use "real" display size for computing available densities" into nyc-mr1-dev
Dirk Dougherty [Mon, 18 Jul 2016 14:52:44 +0000 (14:52 +0000)]
Merge "Doc change: updates for DP5 release notes." into nyc-dev
Ricky Wai [Mon, 18 Jul 2016 14:29:51 +0000 (14:29 +0000)]
Merge \"Do not allow to disable package \"android\"\" into nyc-mr1-dev
am:
a5111bfda4
Change-Id: Ia983198d1c41848d78ef18ed189d6f68cbc39350
Ricky Wai [Mon, 18 Jul 2016 14:22:26 +0000 (14:22 +0000)]
Merge "Do not allow to disable package "android"" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 13:33:35 +0000 (13:33 +0000)]
Merge "Merge \\"Check uid for notification policy access.\\" into nyc-dev am:
8f17d2a48b am:
5710e91931" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Mon, 18 Jul 2016 13:33:04 +0000 (13:33 +0000)]
Merge \\"Check uid for notification policy access.\\" into nyc-dev am:
8f17d2a48b
am:
5710e91931
Change-Id: I1a4957ded3e3526df8b2bb36093b70cee3f8c065
Julia Reynolds [Mon, 18 Jul 2016 13:32:57 +0000 (13:32 +0000)]
Merge \\"Check uid for notification policy access.\\" into nyc-dev am:
8f17d2a48b
am:
5921f81724
Change-Id: I48923935bf394c39441335423a24dd0b88b8b51e
Ricky Wai [Fri, 15 Jul 2016 14:44:07 +0000 (15:44 +0100)]
Do not allow to disable package "android"
Bug:
25337001
Change-Id: I837d70898f00d3c97c8ae1f5eadd0791ba045df6
Julia Reynolds [Mon, 18 Jul 2016 13:25:54 +0000 (13:25 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-dev
am:
8f17d2a48b
Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59
Julia Reynolds [Mon, 18 Jul 2016 13:25:51 +0000 (13:25 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-dev
am:
8f17d2a48b
Change-Id: Ibe8b12cb0bb57a31e0e1ca077863b2cf63daba1a
Julia Reynolds [Mon, 18 Jul 2016 13:16:15 +0000 (13:16 +0000)]
Merge "Check uid for notification policy access." into nyc-dev
Lorenzo Colitti [Mon, 18 Jul 2016 09:17:08 +0000 (18:17 +0900)]
Add an isListen method to NetworkRequests.
This allows simplification of the ConnectivityService code.
Bug:
23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd
Dirk Dougherty [Mon, 18 Jul 2016 03:59:36 +0000 (20:59 -0700)]
Doc change: updates for DP5 release notes.
Change-Id: I39cca9088d6fc5952a359f42e43a324aad4427f0
Abodunrinwa Toki [Sun, 17 Jul 2016 18:25:27 +0000 (19:25 +0100)]
DO NOT MERGE: FloatingToolbar - Check that app supports RTL.
Port I36c0d72984e0abc7c6430cc7d52d8efd7341820e to nyc-mr1-dev.
Bug:
29932935
Change-Id: Icd085508f7d1dd412f4d0805e8fd01734743648e
Abodunrinwa Toki [Sun, 17 Jul 2016 18:20:11 +0000 (18:20 +0000)]
Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev
am:
3b8e0fdf92
Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
Abodunrinwa Toki [Sun, 17 Jul 2016 18:07:08 +0000 (18:07 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev
Tim Murray [Sat, 16 Jul 2016 19:25:37 +0000 (19:25 +0000)]
Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev
am:
afa67f3d34
Change-Id: I2b3afb4acb9038a2d33ecf42bbbcc8c5d754ab5f
Tim Murray [Sat, 16 Jul 2016 19:14:29 +0000 (19:14 +0000)]
Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev
Tim Murray [Sat, 16 Jul 2016 18:28:40 +0000 (11:28 -0700)]
Make sure StrictMode allows disk reads when calling isThreadInProcess.
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.
bug
30170339
Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
Adam Lesinski [Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)]
Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev
am:
c3829f528e
Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6
Andreas Gampe [Sat, 16 Jul 2016 02:38:18 +0000 (02:38 +0000)]
Frameworks/base: Fix braino missing line
am:
06eb24d95e
Change-Id: I34b1b3084da32be43fda62d23c0b955e3cc6f335
TreeHugger Robot [Sat, 16 Jul 2016 02:33:54 +0000 (02:33 +0000)]
Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev
Andreas Gampe [Sat, 16 Jul 2016 01:12:02 +0000 (18:12 -0700)]
Frameworks/base: Fix braino missing line
This got accidentally deleted in cleanup.
Bug:
29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
Adam Lesinski [Sat, 16 Jul 2016 00:49:49 +0000 (17:49 -0700)]
Deprecate Resources constructor and updateConfiguration() method
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().
Bug:
30088019
Bug:
29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
Android Build Merger (Role) [Sat, 16 Jul 2016 00:41:56 +0000 (00:41 +0000)]
Merge "Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am:
9d3bc86207 am:
72022a691a" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Sat, 16 Jul 2016 00:41:33 +0000 (00:41 +0000)]
Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am:
9d3bc86207
am:
72022a691a
Change-Id: I4c85652bbc4d67507c419b5362341e993f932866
Andrew Solovay [Sat, 16 Jul 2016 00:41:16 +0000 (00:41 +0000)]
Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am:
9d3bc86207
am:
8af870a778
Change-Id: I257e7b0774f7892373963883a362b44ba5ec4759
Andrew Solovay [Sat, 16 Jul 2016 00:35:41 +0000 (00:35 +0000)]
Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
am:
9d3bc86207
Change-Id: Iede90cc135476ea34b82f49c464a14eba9d60a31
OSDN Git Service
