OSDN Git Service
Christopher Tate [Tue, 20 Dec 2016 01:10:16 +0000 (01:10 +0000)]
Migrate system+lock wallpaper to lock-only when setting live wp
am:
7cd0010df6
Change-Id: I488880ddcb04894d18535815691d32d542bc71c1
Christopher Tate [Mon, 19 Dec 2016 22:38:44 +0000 (14:38 -0800)]
Migrate system+lock wallpaper to lock-only when setting live wp
If the static imagery is shared between system+lock, preserve the lock
presentation when setting a different system-surface live wallpaper. If
the caller knows it wants to achieve system+lock display of the new live
wallpaper, it follows up setWallpaperComponent() with an explicit clear
of the lock wallpaper state.
Previously, setting a new system live wallpaper would necessarily override
a desired static lock image in the case of system+lock shared imagery.
Now it doesn't.
Bug
32664317
Change-Id: I7ef2cded534f9e6e91899db4c37bd24efaf09fee
Jeremy Joslin [Mon, 19 Dec 2016 22:18:37 +0000 (22:18 +0000)]
Merge "Fix ScanResult array parceling." am:
5fdc86fb27 am:
68764eabb7
am:
5b1a460b94
Change-Id: I52289854a38a36929cd9b8d20e85b00346b3317c
Jeremy Joslin [Mon, 19 Dec 2016 22:14:37 +0000 (22:14 +0000)]
Merge "Fix ScanResult array parceling." am:
5fdc86fb27
am:
68764eabb7
Change-Id: I6b44179d634722828f40524c26ccf6ea51521f11
Jeremy Joslin [Mon, 19 Dec 2016 22:07:20 +0000 (22:07 +0000)]
Merge "Fix ScanResult array parceling."
am:
5fdc86fb27
Change-Id: I25e509ea057370c4380764c47808c0dbde85a6fc
Treehugger Robot [Mon, 19 Dec 2016 21:57:05 +0000 (21:57 +0000)]
Merge "Fix ScanResult array parceling."
Joe LaPenna [Mon, 19 Dec 2016 21:13:31 +0000 (21:13 +0000)]
Merge "Remove "final" from ResultCallback." am:
b60d7b334c am:
8df12d98f7
am:
8c5eb9b10f
Change-Id: I9a234d6176c441b424714dda1de4ec580a12e2c5
Wei Wang [Mon, 19 Dec 2016 21:08:48 +0000 (21:08 +0000)]
Merge "Start sensor service in a seperate thread" into nyc-mr2-dev
am:
9ec4256a17
Change-Id: I0956ba96241ccb9df18ba9f2bfd29cc952659b1a
Wei Wang [Mon, 19 Dec 2016 21:08:22 +0000 (21:08 +0000)]
Start sensor service in a seperate thread
am:
6ba0ef31e8
Change-Id: I325b0d5c02326355c7b04962537e695e7839be09
Joe LaPenna [Mon, 19 Dec 2016 21:07:29 +0000 (21:07 +0000)]
Merge "Remove "final" from ResultCallback." am:
b60d7b334c
am:
8df12d98f7
Change-Id: Ia0266003bff04bf0ec5b3ee7134678c1b1f0e77f
Mark Lu [Mon, 19 Dec 2016 21:05:45 +0000 (21:05 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am:
cbfb58c9d7 am:
70fa908fb2
am:
fa0c9f2352
Change-Id: I845121e5e638fff86c0915213cf3ce87fc914918
Mark Lu [Mon, 19 Dec 2016 21:04:11 +0000 (21:04 +0000)]
docs: remove implicit intent from bindService and startService am:
94ebbe0e58 am:
d7c29565ba
am:
a8107e1074
Change-Id: I39ffafde9285c62d27cf1559d215dd687dbe4aec
Mark Lu [Mon, 19 Dec 2016 21:02:57 +0000 (21:02 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am:
5f05256106 am:
9c834b1241
am:
353e197a8a
Change-Id: I4b338888e82cd7e524db0f04b4a2cb3b725d1109
Brad Ebinger [Mon, 19 Dec 2016 21:01:41 +0000 (21:01 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
am:
73dcab62b7 -s ours
Change-Id: Id30938ad8395a57b7a39becd3c7834df75b2ba07
Joe LaPenna [Mon, 19 Dec 2016 21:01:26 +0000 (21:01 +0000)]
Merge "Remove "final" from ResultCallback."
am:
b60d7b334c
Change-Id: I3b6679368418af3992007f58d47c544cf7a1b1ed
TreeHugger Robot [Mon, 19 Dec 2016 20:59:12 +0000 (20:59 +0000)]
Merge "Start sensor service in a seperate thread" into nyc-mr2-dev
Brad Ebinger [Mon, 19 Dec 2016 20:54:27 +0000 (20:54 +0000)]
Add UI prompt for MMI code failure on 3gpp
am:
ac8d8e7358
Change-Id: Id83a2fa2dd958a0fbfcb2d5eb90528bcf96737b8
Treehugger Robot [Mon, 19 Dec 2016 20:54:13 +0000 (20:54 +0000)]
Merge "Remove "final" from ResultCallback."
Mark Lu [Mon, 19 Dec 2016 20:35:27 +0000 (20:35 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am:
cbfb58c9d7 am:
70fa908fb2
am:
6461737fa5
Change-Id: I37fab5a4733b27a359800cc4cf0f3982f209a8f8
Mark Lu [Mon, 19 Dec 2016 20:34:23 +0000 (20:34 +0000)]
docs: remove implicit intent from bindService and startService am:
94ebbe0e58 am:
d7c29565ba
am:
8c232935f0
Change-Id: I45cdec5b2820a4a95a8aa6e1b67856891a8a6cd5
Mark Lu [Mon, 19 Dec 2016 20:29:08 +0000 (20:29 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am:
cbfb58c9d7
am:
70fa908fb2
Change-Id: I6b37ea3bf8b451b941b49b3124b226a641b28b64
Mark Lu [Mon, 19 Dec 2016 20:28:59 +0000 (20:28 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am:
cbfb58c9d7
am:
70fa908fb2
Change-Id: I1eab802afe75f847555baa8964030a1bb994107a
Mark Lu [Mon, 19 Dec 2016 20:27:56 +0000 (20:27 +0000)]
docs: remove implicit intent from bindService and startService am:
94ebbe0e58
am:
d7c29565ba
Change-Id: Ife9581030d8579d6e2dd625814a049d5f488229a
Mark Lu [Mon, 19 Dec 2016 20:27:52 +0000 (20:27 +0000)]
docs: remove implicit intent from bindService and startService am:
94ebbe0e58
am:
d7c29565ba
Change-Id: I44109d60ff26725daf6ebbce50bac9a7068146fe
Mark Lu [Mon, 19 Dec 2016 20:27:51 +0000 (20:27 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am:
5f05256106 am:
9c834b1241
am:
4da3266828
Change-Id: I65e2a1c43bd049e5c4cada55e8689ecc98a70fa5
Mark Lu [Mon, 19 Dec 2016 20:22:00 +0000 (20:22 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
am:
cbfb58c9d7
Change-Id: If12008d4e9fe1883c6c4f21e6e6736045b325182
Mark Lu [Mon, 19 Dec 2016 20:21:57 +0000 (20:21 +0000)]
docs: remove implicit intent from bindService and startService
am:
94ebbe0e58
Change-Id: Iaf24452f3456703c917a2a574ff218c9eac854bd
Mark Lu [Mon, 19 Dec 2016 20:21:26 +0000 (20:21 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am:
5f05256106
am:
9c834b1241
Change-Id: I6ab667b17df3101370ed57f30ab273077a27c346
Mark Lu [Mon, 19 Dec 2016 20:21:21 +0000 (20:21 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am:
5f05256106
am:
9c834b1241
Change-Id: I3288982f953f36ae08a36ca324edb6937633bd18
Mark Lu [Mon, 19 Dec 2016 20:16:15 +0000 (20:16 +0000)]
docs: update Paint.setTextSize() to indicate pixel units
am:
5f05256106
Change-Id: I9709ea36fe7657c8a06abe1c58760b30112e0e63
Mark Lu [Mon, 19 Dec 2016 20:13:15 +0000 (20:13 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
Brad Ebinger [Mon, 19 Dec 2016 19:53:00 +0000 (19:53 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
Joe LaPenna [Thu, 15 Dec 2016 22:46:52 +0000 (14:46 -0800)]
Remove "final" from ResultCallback.
Removing final makes providers easier to test using mocks.
Test: Build system image.
Change-Id: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Merged-In: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Android Build Merger (Role) [Mon, 19 Dec 2016 19:20:12 +0000 (19:20 +0000)]
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am:
a586b546c3 am:
5109de9bd3" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 19 Dec 2016 19:19:31 +0000 (19:19 +0000)]
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am:
a586b546c3 am:
63fb5ccc17" into nyc-mr2-dev-plus-aosp
Charles Mendis [Mon, 19 Dec 2016 19:19:19 +0000 (19:19 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am:
a586b546c3
am:
5109de9bd3
Change-Id: I831ab60727b0d7fa57d379c110f37e2442ba5e5e
Android Build Merger (Role) [Mon, 19 Dec 2016 19:18:53 +0000 (19:18 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am:
67639a5f67 am:
a2160c27f9" into nyc-mr2-dev-plus-aosp
Charles Mendis [Mon, 19 Dec 2016 19:18:51 +0000 (19:18 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am:
a586b546c3
am:
63fb5ccc17
Change-Id: Ifd33331fddf87c8b9349654aee0c78216a53561d
Michael Kwan [Mon, 19 Dec 2016 19:17:56 +0000 (19:17 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss. am:
67639a5f67
am:
a2160c27f9
Change-Id: I4b0ecf9f50e43c7026a52f767af1bc9717626148
Michael Kwan [Mon, 19 Dec 2016 19:17:48 +0000 (19:17 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss. am:
67639a5f67
am:
5a0c0ffd03
Change-Id: Id8faa62cb551424036aae9f542f2d0776cfea522
Charles Mendis [Mon, 19 Dec 2016 19:11:52 +0000 (19:11 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
am:
a586b546c3
Change-Id: Ib994cff58777ab8b33a0f1bf79d6bf4128556344
Michael Kwan [Mon, 19 Dec 2016 19:11:48 +0000 (19:11 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss.
am:
67639a5f67
Change-Id: I92bc472b3519020eeadf61b1e8047aee9e8bd96c
Charles Mendis [Mon, 19 Dec 2016 19:11:47 +0000 (19:11 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
am:
a586b546c3
Change-Id: I32b15e3ab326700434f488aad7f6e8f05bfa153e
Michael Kwan [Mon, 19 Dec 2016 19:11:45 +0000 (19:11 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss.
am:
67639a5f67
Change-Id: I8ceab83a3a8287bdf8d2a7ff88427404543755c9
Charles Mendis [Mon, 19 Dec 2016 19:05:49 +0000 (19:05 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
Marie Janssen [Mon, 19 Dec 2016 19:01:03 +0000 (19:01 +0000)]
Merge changes I546d7abc,I32163278 into nyc-mr2-dev
am:
df37f1fa74
Change-Id: I082c8d392bd693ec0cad019c24bc03829dd6bad0
Marie Janssen [Mon, 19 Dec 2016 19:00:55 +0000 (19:00 +0000)]
Bluetooth: fix issues re-enabling after crash
am:
fa63068deb
Change-Id: I89c5253d284b64359c1abc5c078bcd69bedfc503
Marie Janssen [Mon, 19 Dec 2016 18:31:10 +0000 (10:31 -0800)]
resolve merge conflicts of
ffcf88f to nyc-mr2-dev-plus-aosp
Change-Id: Ib8c2e6770448bda00c0d64b42ce0495049acb268
Philipp Weiß [Mon, 19 Dec 2016 18:03:53 +0000 (18:03 +0000)]
Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev
am:
f84f98c4e2
Change-Id: I505fade40150c0a425ab44a292219cf071f10026
phweiss [Mon, 19 Dec 2016 18:03:47 +0000 (18:03 +0000)]
DO NOT MERGE Add network logging icon to Quicksettings when enabled
am:
c94b637305
Change-Id: I227210c1d938b98bfb8b2a5f895b837fad1c6181
Marie Janssen [Mon, 19 Dec 2016 17:58:38 +0000 (17:58 +0000)]
Merge changes I546d7abc,I32163278 into nyc-mr2-dev
* changes:
Bluetooth: fix issues re-enabling after crash
Bluetooth: log message improvements
Philipp Weiß [Mon, 19 Dec 2016 17:57:13 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev
Jeremy Joslin [Sat, 17 Dec 2016 01:48:13 +0000 (17:48 -0800)]
Fix ScanResult array parceling.
readParcelableArray() wasn't working as expected so I just parceled
the array myself.
Test: adb shell am instrument -e class android.net.RecommendationRequestTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I83939d17769930b707b8bc579542c74a05e31d19
Merged-In: I47bc31adbedea817feaa5953cb6ee48506f9c6d6
Daniel Sandler [Mon, 19 Dec 2016 16:50:18 +0000 (16:50 +0000)]
Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev
am:
be09dd77dc
Change-Id: I9dd8c496cb6e9fec63ba370d25faedbcd505dd13
Dan Sandler [Mon, 19 Dec 2016 16:50:12 +0000 (16:50 +0000)]
Avoid NPE in notification inline controls.
am:
6e54b889d0
Change-Id: I4d581b3d8e59bb9baa16199243b59aaa57d8fc7a
Daniel Sandler [Mon, 19 Dec 2016 16:44:09 +0000 (16:44 +0000)]
Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev
Michal Karpinski [Mon, 19 Dec 2016 13:50:05 +0000 (13:50 +0000)]
Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" into nyc-mr2-dev
am:
bd510de4e9
Change-Id: I82c5e02fb4356465a738b2d7906b6894065e73ef
Michal Karpinski [Mon, 19 Dec 2016 13:49:58 +0000 (13:49 +0000)]
Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled
am:
a775ad997b
Change-Id: Iffda619c616ab804b97a837910ca55de4d283cf0
TreeHugger Robot [Mon, 19 Dec 2016 13:43:07 +0000 (13:43 +0000)]
Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" into nyc-mr2-dev
Hugo Benichi [Mon, 19 Dec 2016 08:40:43 +0000 (08:40 +0000)]
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
am:
85f3996d72
Change-Id: Ia780475dbbd9ebd58f5bcc9cefa74108f48ca53b
Hugo Benichi [Mon, 19 Dec 2016 08:40:37 +0000 (08:40 +0000)]
DO NOT MERGE IP Connectivity metrics: add connect() statistics
am:
2299a1c401
Change-Id: I7ad93b1b3a3446ffd6dce7c0799ddb9a2b43955f
Hugo Benichi [Mon, 19 Dec 2016 08:39:55 +0000 (08:39 +0000)]
DO NOT MERGE Fix IP connectivity metrics tests
am:
93c0de0a35
Change-Id: Ia6a28b09263729caa72786062e134f8c684e3ccb
Hugo Benichi [Mon, 19 Dec 2016 08:38:54 +0000 (08:38 +0000)]
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
am:
097bde6c8f
Change-Id: Ibe6d3945cda64f55c6aab7ef4fc4a6cd8a6daf05
Hugo Benichi [Mon, 19 Dec 2016 08:38:10 +0000 (08:38 +0000)]
DO NOT MERGE IP connectivity metrics: add transport field.
am:
4c9d3f19cd
Change-Id: I1e6b0f9e7b8f2e2808d85e302fdd3ca1dc4d5a41
Hugo Benichi [Mon, 19 Dec 2016 08:31:10 +0000 (08:31 +0000)]
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
* changes:
DO NOT MERGE IP Connectivity metrics: add connect() statistics
DO NOT MERGE Fix IP connectivity metrics tests
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
DO NOT MERGE IP connectivity metrics: add transport field.
Hugo Benichi [Mon, 19 Dec 2016 08:29:30 +0000 (08:29 +0000)]
Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
am:
05d36569b6
Change-Id: I09bbd93408e2de8b4ce159a7b22d3650a04ba081
Hugo Benichi [Mon, 19 Dec 2016 08:29:23 +0000 (08:29 +0000)]
DO NOT MERGE Network notifications: revamp keying scheme
am:
84daaea8fd
Change-Id: Ibad7d0210b2c69826462b781f43a82d65849ebfb
Hugo Benichi [Mon, 19 Dec 2016 08:29:16 +0000 (08:29 +0000)]
DO NOT MERGE Define Network notification proto constants.
am:
065acc5a6c
Change-Id: Ic1bb6306d6a0f2e5a764abb1834f75ad796c9f28
Hugo Benichi [Mon, 19 Dec 2016 08:29:11 +0000 (08:29 +0000)]
DO NOT MERGE Unit tests for NetworkNotificationManager
am:
d3da17a260
Change-Id: I873ea4a5625c526d61017967604305ada548f907
Hugo Benichi [Mon, 19 Dec 2016 08:25:25 +0000 (08:25 +0000)]
Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
* changes:
DO NOT MERGE Network notifications: revamp keying scheme
DO NOT MERGE Define Network notification proto constants.
DO NOT MERGE Unit tests for NetworkNotificationManager
Hugo Benichi [Mon, 19 Dec 2016 06:00:34 +0000 (06:00 +0000)]
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev
am:
64bc2580e3
Change-Id: I24ab257a4f9646edf25bde3c95f31b88ff35aa48
Hugo Benichi [Mon, 19 Dec 2016 06:00:28 +0000 (06:00 +0000)]
DO NOT MERGE Netd events: record connect() success/errno
am:
e8fe0aaab9
Change-Id: Ia9d271d4dac362e930c7c3463bdbafd9a85ca739
Hugo Benichi [Mon, 19 Dec 2016 05:55:21 +0000 (05:55 +0000)]
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev
Hugo Benichi [Mon, 19 Dec 2016 02:07:41 +0000 (02:07 +0000)]
Captive portals: login activity probes like NetworkMonitor
am:
cdf3ba48cc
Change-Id: Ie85df7dd734b872cc361d0820edbfffc928f9f3a
Hugo Benichi [Tue, 13 Dec 2016 23:23:40 +0000 (08:23 +0900)]
Captive portals: login activity probes like NetworkMonitor
This patch changes CaptivePortalLoginActivity captive portal test to be
consistent with NetworkMonitor by:
- using Network.java to open the http connection.
- adding a UserAgent property to the request header.
Test: manually tested.
Bug:
32369183
Change-Id: I33cbcdab9809c712d998da6d925bdd4e3093f8ff
Michael Rosenfeld [Sun, 18 Dec 2016 00:28:42 +0000 (00:28 +0000)]
Merge "Clean up local hprofs" am:
9ab94e15c7 am:
1876d82450
am:
67fd9f3968
Change-Id: I8eaea581cfda4844c3ea81f7ee63f0cfc40ef3e0
Marie Janssen [Sun, 18 Dec 2016 00:24:42 +0000 (00:24 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash" am:
e2c22e38d5 am:
ff0d3e1c8d -s ours
am:
7fd7bc57ee
Change-Id: I711edb691cd0cbbd4c5f52d4ebdc27fd7adb2d26
Michael Rosenfeld [Sun, 18 Dec 2016 00:21:19 +0000 (00:21 +0000)]
Merge "Clean up local hprofs" am:
9ab94e15c7
am:
1876d82450
Change-Id: I16c2e27c21d933e6090adb48af144c731a2c8ac6
Marie Janssen [Sun, 18 Dec 2016 00:20:18 +0000 (00:20 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash" am:
e2c22e38d5
am:
ff0d3e1c8d -s ours
Change-Id: I5e891c190c1c86d33176f83a2e92ce807af45472
Mark Lu [Wed, 14 Dec 2016 00:29:51 +0000 (16:29 -0800)]
docs: remove implicit intent from bindService and startService
bug:
18295867
Change-Id: Ib4b561dd215f4b124ce9a90b446bc03676f7e00a
Mark Lu [Fri, 16 Dec 2016 22:23:47 +0000 (14:23 -0800)]
docs: update Paint.setTextSize() to indicate pixel units
bug:
2321154
Change-Id: Ic71404677a8079c744b99d4848d69c6ff52089ab
Android Build Merger (Role) [Sat, 17 Dec 2016 05:10:32 +0000 (05:10 +0000)]
Merge "docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4 am:
206d947de9" into nyc-mr2-dev-plus-aosp
Joe Fernandez [Sat, 17 Dec 2016 05:09:40 +0000 (05:09 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4
am:
206d947de9
Change-Id: I56fe38f6bb41a9ddc17b197a1284361600443d23
Joe Fernandez [Sat, 17 Dec 2016 05:09:37 +0000 (05:09 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4
am:
bd7fab30dc
Change-Id: I1764cf01406aa25d009df76ce4e76e1763ab1be7
Joe Fernandez [Sat, 17 Dec 2016 04:59:06 +0000 (04:59 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38
am:
536dc4ecc4
Change-Id: I431cc25fd1658a08497c562abefa05f55df9382f
Joe Fernandez [Sat, 17 Dec 2016 04:59:05 +0000 (04:59 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38
am:
536dc4ecc4
Change-Id: I00433f2c53c4ae494082ce21a4edb63717347906
Joe Fernandez [Sat, 17 Dec 2016 04:48:04 +0000 (04:48 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a
am:
e161f75d38
Change-Id: I622c23e61f4e8db5a51a9d2425cc1fe379ec9505
Joe Fernandez [Sat, 17 Dec 2016 04:37:05 +0000 (04:37 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e
am:
045ae0458a
Change-Id: I2257467a9b263897d2af594720de61d29a982709
Joe Fernandez [Sat, 17 Dec 2016 04:26:02 +0000 (04:26 +0000)]
docs: Add deprecation message for the developer.android.com docs
am:
b9bd6cca9e
Change-Id: I3ba7d4519c491bdf09836f096106b4a6bc52e116
Android Build Merger (Role) [Sat, 17 Dec 2016 04:05:25 +0000 (04:05 +0000)]
Merge "[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba am:
5857a47008" into nyc-mr2-dev-plus-aosp
Svet Ganov [Sat, 17 Dec 2016 04:04:35 +0000 (04:04 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba
am:
5857a47008
Change-Id: Idfc7dbcdc5dea568f07b2b47c9cbedb176527fb4
Svet Ganov [Sat, 17 Dec 2016 04:04:31 +0000 (04:04 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba
am:
d10857f210
Change-Id: Ibb218fa69c45aa9404be89a7f5394023395417b1
Svet Ganov [Sat, 17 Dec 2016 03:54:05 +0000 (03:54 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3
am:
0dca3a2fba
Change-Id: Ifd62443464dfa77b022552a1fada1288cfd42afe
Svet Ganov [Sat, 17 Dec 2016 03:54:00 +0000 (03:54 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3
am:
0dca3a2fba
Change-Id: Ieb84f199c9cfe49045dc969a3c9a620037e7587a
Svet Ganov [Sat, 17 Dec 2016 03:42:58 +0000 (03:42 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753
am:
5034efbaf3
Change-Id: I22c38f921047ba7ecea5826701e3024de9a3d110
Svet Ganov [Sat, 17 Dec 2016 03:32:01 +0000 (03:32 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours
am:
c91845f753
Change-Id: Ia85d2855dd8360b94fecb4bf6cd280ea4518d0e1
Svet Ganov [Sat, 17 Dec 2016 03:21:28 +0000 (03:21 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
am:
c3db570a00 -s ours
Change-Id: I63b03cd2b057f95aefab23cdb4a29766ec304544
Android Build Merger (Role) [Sat, 17 Dec 2016 02:40:21 +0000 (02:40 +0000)]
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789 am:
760d127583" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Sat, 17 Dec 2016 02:39:47 +0000 (02:39 +0000)]
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789 am:
68b2be6105" into nyc-mr2-dev-plus-aosp
Mark Lu [Sat, 17 Dec 2016 02:39:39 +0000 (02:39 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789
am:
760d127583
Change-Id: I066d9f922e4e0b6baad2ce9b6be72e8435f7fc0a
OSDN Git Service
