git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Makoto Onuki [Tue, 30 Aug 2016 20:19:15 +0000 (20:19 +0000)]

Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev am: 9480c98ddf am: e58471e7e8
am: 7121484984

Change-Id: I9f855aa1f81c5517de8a5e024afb10d5d8711ce3

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:18:34 +0000 (20:18 +0000)]

Backport shortcut manager test utilities to DR am: 0a15cd4ba0 am: fda26f6ffb
am: 54541310a5

Change-Id: I6629ab8ccb530821f07699420d6fa383d2bee5bb

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:11:13 +0000 (20:11 +0000)]

Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev am: 9480c98ddf
am: e58471e7e8

Change-Id: Ib4765bddfa7afe4538ac81d92b9b5cc020b24a51

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:10:44 +0000 (20:10 +0000)]

Backport shortcut manager test utilities to DR am: 0a15cd4ba0
am: fda26f6ffb

Change-Id: Ifdbd54917bb866235d4e21c59290b2b962c77689

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:08:35 +0000 (20:08 +0000)]

Merge "Shortcut: Improve backup & restore" into nyc-mr1-dev am: dec5726c43
am: a4e4ab809d

Change-Id: I0efff0e047586d59ac8cd443a9283394f5ad602c

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:08:31 +0000 (20:08 +0000)]

Shortcut: Improve backup & restore am: fc4cf2da34
am: 27b36f4789

Change-Id: I24e4739da81923ca2cf3cfdfd8c97b3fea53ec95

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:02:35 +0000 (20:02 +0000)]

Merge "Shortcut: Improve backup & restore" into nyc-mr1-dev
am: dec5726c43

Change-Id: I6797978af8c131a8690bc1c71ccae281b4a94bdb

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:02:31 +0000 (20:02 +0000)]

Shortcut: Improve backup & restore
am: fc4cf2da34

Change-Id: I28f431158929dd585b0c7523ee6e16798650f98a

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:01:35 +0000 (20:01 +0000)]

Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev
am: 9480c98ddf

Change-Id: If0820595b9695f1771c5c6b9ad52689d428447f5

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 20:01:32 +0000 (20:01 +0000)]

Backport shortcut manager test utilities to DR
am: 0a15cd4ba0

Change-Id: I6e9f7a0399b3fe5a9e340770ec9a28df001f084f

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 19:57:34 +0000 (19:57 +0000)]

Merge "Shortcut: Improve backup & restore" into nyc-mr1-dev

commit | commitdiff | tree

Makoto Onuki [Tue, 30 Aug 2016 19:54:55 +0000 (19:54 +0000)]

Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:56:44 +0000 (18:56 +0000)]

Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7 am: 92028aeb79 am: 393bd2e87a
am: d4ed3c0d51

Change-Id: I57df39bc9026e81a71c0ad54dc4cef8f9b9164f9

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:56:34 +0000 (18:56 +0000)]

docs: Fix broken camera example am: 3f97bc25d4 am: 3dbf596090 am: 18b1be0deb
am: ec518d6f0e

Change-Id: I0bf5ec4203b5c0318b7c871fb693f8bbd4dcff81

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:51:00 +0000 (18:51 +0000)]

Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7 am: 92028aeb79
am: 393bd2e87a

Change-Id: I5dc7e24fcf0759fcebfb7314ae3b08cf381f3016

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:50:56 +0000 (18:50 +0000)]

docs: Fix broken camera example am: 3f97bc25d4 am: 3dbf596090
am: 18b1be0deb

Change-Id: Ic63305e8d3d86f7e437d881092afe1b7a0d9f8aa

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:45:26 +0000 (18:45 +0000)]

Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7
am: b213e0cedb

Change-Id: I624d87387a1230ba51fd19e43c9fe9e48180606c

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:45:24 +0000 (18:45 +0000)]

docs: Fix broken camera example am: 3f97bc25d4
am: d06a603bcf

Change-Id: I7e9c2aca242945fd369b489ef0da156ccc8468de

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:45:23 +0000 (18:45 +0000)]

Merge "docs: Fix broken camera example" into nyc-dev am: 36f4638fe7
am: 92028aeb79

Change-Id: I5753e2e34f7f1250e4b115f3e9d15b0e19c1f1e6

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:45:20 +0000 (18:45 +0000)]

docs: Fix broken camera example am: 3f97bc25d4
am: 3dbf596090

Change-Id: Ice0817f1e83268a3d2877de380e1185b9255654c

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:39:37 +0000 (18:39 +0000)]

Merge "docs: Fix broken camera example" into nyc-dev
am: 36f4638fe7

Change-Id: I93725b6c49591f174ff4863386724be865cb9715

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:39:33 +0000 (18:39 +0000)]

docs: Fix broken camera example
am: 3f97bc25d4

Change-Id: Ibd8eba49bdd6d9afa850fd22c634a70d3b7d4890

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:39:27 +0000 (18:39 +0000)]

Merge "docs: Fix broken camera example" into nyc-dev
am: 36f4638fe7

Change-Id: Id8a885af6c0f9887e6aaa82f662c264c86ba9791

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:39:24 +0000 (18:39 +0000)]

docs: Fix broken camera example
am: 3f97bc25d4

Change-Id: I80f79eab0f11185f671bad1b57766f6fcf874464

commit | commitdiff | tree

Mark Goldstein [Tue, 30 Aug 2016 18:34:21 +0000 (18:34 +0000)]

Merge "docs: Fix broken camera example" into nyc-dev

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 18:31:01 +0000 (18:31 +0000)]

Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev am: 4d1f3047e3 am: 254890a98c am: b6022a2748
am: 8eec8f6123

Change-Id: Id8345b85e0a9d2801dccf482d4a130cb827da1f1

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 18:30:56 +0000 (18:30 +0000)]

add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748 am: 99e44c903c am: 939c23d05a am: c731669507
am: 8ea970f59c

Change-Id: I5a8abb169c6d08cfe0b849e3c66fb8923dbc567e

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 18:24:56 +0000 (18:24 +0000)]

Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev am: 4d1f3047e3 am: 254890a98c
am: b6022a2748

Change-Id: I9ef95b55ed47e00fd649fb0b3960f5083e9da5c2

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 18:24:54 +0000 (18:24 +0000)]

add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748 am: 99e44c903c am: 939c23d05a
am: c731669507

Change-Id: I22eefcd14bcdcda51dc78552c7a323248c4bdcbf

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 18:19:26 +0000 (18:19 +0000)]

Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev am: 4d1f3047e3
am: a7373b08b9

Change-Id: Iaade0b660592045cd1dad990494148ee28c24f34

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 18:19:23 +0000 (18:19 +0000)]

add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748 am: 99e44c903c
am: cbfe7475d8

Change-Id: I1d31f5e5d8e76a4acb5459bb9e6a4e3cf8e9a5e5

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 18:19:21 +0000 (18:19 +0000)]

Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev am: 4d1f3047e3
am: 254890a98c

Change-Id: Idd33d16101bcfea96a4be0ee1ac131aef2df9065

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 18:19:19 +0000 (18:19 +0000)]

add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748 am: 99e44c903c
am: 939c23d05a

Change-Id: I084cb46d63ebdab7ee2286024bfc3b1962b3bad5

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 18:14:51 +0000 (18:14 +0000)]

Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev
am: 4d1f3047e3

Change-Id: I9c32106d2eef0a01de0a4f309a14d22eb11f7c48

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 18:14:35 +0000 (18:14 +0000)]

add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748
am: 99e44c903c

Change-Id: I5f13d93bba2dd6a43bde836842243e0f70e5a501

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 18:14:17 +0000 (18:14 +0000)]

commit | commitdiff | tree

smain@google.com [Tue, 30 Aug 2016 18:14:12 +0000 (18:14 +0000)]

add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748
am: 99e44c903c

Change-Id: I6f407f90b8e53849a6d1c0ed70adb1ca8c90234f

commit | commitdiff | tree

Scott Main [Tue, 30 Aug 2016 18:09:03 +0000 (18:09 +0000)]

Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev

commit | commitdiff | tree

Sudheer Shanka [Tue, 30 Aug 2016 18:05:58 +0000 (18:05 +0000)]

Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev am: 65ce524bde
am: 26fa6328b8

Change-Id: I801d3d3cd6d6781d12d8cc692991918d968cab3e

commit | commitdiff | tree

Sudheer Shanka [Tue, 30 Aug 2016 18:05:51 +0000 (18:05 +0000)]

Allow apps with CREATE_USERS permission to create demo users. am: 234d1afd79
am: 0be41fc1a9

Change-Id: I9da0eedb106d61c7041df78d0b287e6f28fe3069

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 18:05:45 +0000 (18:05 +0000)]

Merge "Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45 am: 3a25ff9402" into nyc-mr1-dev am: 5d2fbd78de
am: ae0326774b

Change-Id: I0eef9f406615a50a26bb7b2d25c6919b80befaae

commit | commitdiff | tree

Sudheer Shanka [Tue, 30 Aug 2016 17:59:17 +0000 (17:59 +0000)]

Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev
am: 65ce524bde

Change-Id: I8c6844cbb109dee8d7b6c72763674c3f4702a288

commit | commitdiff | tree

Sudheer Shanka [Tue, 30 Aug 2016 17:59:15 +0000 (17:59 +0000)]

Allow apps with CREATE_USERS permission to create demo users.
am: 234d1afd79

Change-Id: I65451cd9ce17c9af38ecd21e62ea96b27d027d01

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:57:25 +0000 (17:57 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45 am: 3a25ff9402 am: bd0fea6ef6
am: bd5fb1fd4f

Change-Id: I51d59fd70985a5f13d966084615e3e4c6e5c0bb5

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:57:21 +0000 (17:57 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0" into nyc-mr1-dev am: bc6425f838
am: 15d09ad4ee

Change-Id: Ib08da06f3797ca40217aa57fba1c92dcc091213b

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:57:18 +0000 (17:57 +0000)]

Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0 am: a2173f8154
am: 8e02f356d2

Change-Id: I185d00fdd39e1424881639835fdf8accac3146cf

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 30 Aug 2016 17:57:15 +0000 (17:57 +0000)]

Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev am: 0656931d18
am: 033defa1a0

Change-Id: I9bf3f96a6257d462fcb31a24434ef4c22aff125d

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 30 Aug 2016 17:57:12 +0000 (17:57 +0000)]

android.view.Surface: Add parceling warning am: f005f5ed88
am: 286b1a83e4

Change-Id: I799dca3ed9da618ec88b8d554520aba649918d94

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:50:33 +0000 (17:50 +0000)]

Merge "Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45 am: 3a25ff9402" into nyc-mr1-dev
am: 5d2fbd78de

Change-Id: I82dcf538b794de27d91acb8a64563a2af51c37bd

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:50:31 +0000 (17:50 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45 am: 3a25ff9402
am: bd0fea6ef6

Change-Id: I69bf7910a4f4e768e43771f996c27f3077ec9089

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:50:25 +0000 (17:50 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0" into nyc-mr1-dev
am: bc6425f838

Change-Id: I5410c173009a3b2a3d65cae2a6d74865539495ff

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:50:22 +0000 (17:50 +0000)]

Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0
am: a2173f8154

Change-Id: I0367ad438b18634a066d17e1ec8179faec07d8f7

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 30 Aug 2016 17:50:16 +0000 (17:50 +0000)]

Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev
am: 0656931d18

Change-Id: I763c8c9e807e6cd28879ff47817471c21ad45798

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 30 Aug 2016 17:50:12 +0000 (17:50 +0000)]

android.view.Surface: Add parceling warning
am: f005f5ed88

Change-Id: Id2c772873fbf98653e751036790484d0fbf7bb16

commit | commitdiff | tree

Sudheer Shanka [Tue, 30 Aug 2016 17:46:12 +0000 (17:46 +0000)]

Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 17:44:48 +0000 (17:44 +0000)]

Merge "Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45 am: 3a25ff9402" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 17:44:35 +0000 (17:44 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6 am: 75152d61b0" into nyc-mr1-dev

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:44:19 +0000 (17:44 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45
am: dae4b8b2a8

Change-Id: I14dcdfcd556bdeb4dd905253b95083c71fd0c9fe

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:44:14 +0000 (17:44 +0000)]

Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6
am: 84c45e7085

Change-Id: I1e273130390949bd15eba0a1f67a01e464ab7f63

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 30 Aug 2016 17:44:08 +0000 (17:44 +0000)]

Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:44:09 +0000 (17:44 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev am: 5d628b1e45
am: 3a25ff9402

Change-Id: I8d4783f155334b5c681765b12b0f59c3e30a8bd5

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:44:04 +0000 (17:44 +0000)]

Enforce consistent sizes for arrays in SpannableStringInternal am: 9cde7244b6
am: 75152d61b0

Change-Id: I7b82b8367671de55fb0e1000869704dbbec843e4

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:36:36 +0000 (17:36 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
am: 5d628b1e45

Change-Id: Ib73fa8726635a0e04600edc4bf72123d57c235df

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:36:33 +0000 (17:36 +0000)]

Enforce consistent sizes for arrays in SpannableStringInternal
am: 9cde7244b6

Change-Id: Ie1fa575d83754d39a6bc30ba542411709f7a2c46

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:33:35 +0000 (17:33 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
am: 5d628b1e45

Change-Id: I4a2b24becdda847b7cf301d7224c218a1fab7dc7

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:33:33 +0000 (17:33 +0000)]

Enforce consistent sizes for arrays in SpannableStringInternal
am: 9cde7244b6

Change-Id: I461863c5a4dad8f050b14f55d14020ab1a0874f7

commit | commitdiff | tree

Raph Levien [Tue, 30 Aug 2016 17:25:55 +0000 (17:25 +0000)]

Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev

commit | commitdiff | tree

Neil Fuller [Tue, 30 Aug 2016 14:45:08 +0000 (14:45 +0000)]

Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c am: 033101bb99
am: c1d52a634c

Change-Id: I312e5b61c69a8ac366120127c18b094c4a14b2b1

commit | commitdiff | tree

Neil Fuller [Tue, 30 Aug 2016 14:39:26 +0000 (14:39 +0000)]

Merge "Track libcore java.lang.reflect API changes" am: cff3f7001c
am: 033101bb99

Change-Id: I230bfff78e929b646c044f0f362531f05e16f632

commit | commitdiff | tree

Neil Fuller [Tue, 30 Aug 2016 14:33:29 +0000 (14:33 +0000)]

Merge "Track libcore java.lang.reflect API changes"
am: cff3f7001c

Change-Id: Ie68db07c1211f161d7757186ff5ffadd506deef6

commit | commitdiff | tree

Neil Fuller [Tue, 30 Aug 2016 14:26:34 +0000 (14:26 +0000)]

Merge "Track libcore java.lang.reflect API changes"

commit | commitdiff | tree

Neil Fuller [Mon, 22 Aug 2016 17:41:52 +0000 (18:41 +0100)]

Track libcore java.lang.reflect API changes

The modifications to Class / Field affect the .txt file
for no good reason: the use of a different generic
variable name results in changes because the tools think
methods have been added / removed when they haven't.

The only interface change from upstream included is adding
"extends AnnotatedElement" to GenericDeclaration. All (platform)
subclasses already did implement this interface. App classes may
be affected but only if they do not currently implement those
methods and they are somehow called.

Bug: 28666126
Test: cts ran for libcore (libcore, harmony_java_lang, org)
Change-Id: Ice5afb80834d7f7a4d23dade21a1590c6b323ed8

commit | commitdiff | tree

Lorenzo Colitti [Tue, 30 Aug 2016 11:02:41 +0000 (11:02 +0000)]

Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev am: f45f9d31d3 am: bad422e647
am: 4af40ef464

Change-Id: I133b94dcc7047b839309985a56a4d0d91370e7db

commit | commitdiff | tree

Lorenzo Colitti [Tue, 30 Aug 2016 11:02:33 +0000 (11:02 +0000)]

Don't notify on network switch if source network is validated. am: c2e10bb074 am: b301283d57
am: a0a41b1e3d

Change-Id: I047a0040798223c163d333996e6bc06e206129a0

commit | commitdiff | tree

Lorenzo Colitti [Tue, 30 Aug 2016 10:56:56 +0000 (10:56 +0000)]

Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev am: f45f9d31d3
am: bad422e647

Change-Id: I856e54864e96d5cb6c96c0cd38d73cf4ee5995b9

commit | commitdiff | tree

Lorenzo Colitti [Tue, 30 Aug 2016 10:56:52 +0000 (10:56 +0000)]

Don't notify on network switch if source network is validated. am: c2e10bb074
am: b301283d57

Change-Id: I5ba45a71369aec6e3ddb771c365512e126bc51c4

commit | commitdiff | tree

Lorenzo Colitti [Tue, 30 Aug 2016 10:51:21 +0000 (10:51 +0000)]

Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev
am: f45f9d31d3

Change-Id: Ic6ab6d1048a89c12b44c6c33e77c8ead7f641575

commit | commitdiff | tree

Lorenzo Colitti [Tue, 30 Aug 2016 10:51:19 +0000 (10:51 +0000)]

Don't notify on network switch if source network is validated.
am: c2e10bb074

Change-Id: I85fdb0faf48a54ab63b5b23f1e992bc5e9116194

commit | commitdiff | tree

TreeHugger Robot [Tue, 30 Aug 2016 10:46:30 +0000 (10:46 +0000)]

Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev

commit | commitdiff | tree

Erik Kline [Tue, 30 Aug 2016 07:22:13 +0000 (07:22 +0000)]

Merge "Remove INetd AIDL reference" into nyc-mr1-dev am: 0a272fcba7
am: 833f943d7c

Change-Id: Icd7bd6b64a23871aeefe2bbf2a41eadd95333dec

commit | commitdiff | tree

Erik Kline [Tue, 30 Aug 2016 07:22:09 +0000 (07:22 +0000)]

Remove INetd AIDL reference am: ee5de9d245
am: 6b4c55f54f

Change-Id: Ib062c3ead134007022d127b215f2d353251aaad9

commit | commitdiff | tree

Erik Kline [Tue, 30 Aug 2016 07:17:17 +0000 (07:17 +0000)]

Merge "Remove INetd AIDL reference" into nyc-mr1-dev
am: 0a272fcba7

Change-Id: Iba5c0baf7b64db5173f438465d541960438dd205

commit | commitdiff | tree

Erik Kline [Tue, 30 Aug 2016 07:17:12 +0000 (07:17 +0000)]

Remove INetd AIDL reference
am: ee5de9d245

Change-Id: I88ef2f4b1782b6e58578ba1c7928635c54d614f6

commit | commitdiff | tree

TreeHugger Robot [Tue, 30 Aug 2016 07:09:28 +0000 (07:09 +0000)]

Merge "Remove INetd AIDL reference" into nyc-mr1-dev

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:58:11 +0000 (05:58 +0000)]

Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev am: b9d4f91630 am: 79ecffe719 am: d522a6f630
am: 59232bfc0b

Change-Id: Ie0ca46543e7a33ccf757ba96447631b0514ac425

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:58:06 +0000 (05:58 +0000)]

Sanity check ICMP6 router advertisement packets am: a36213867a -s ours am: e39980689e am: 008c82c10b
am: 17d22a4022

Change-Id: I69fb9011ca5bf49a74ba9744a70362d27f2b8a01

commit | commitdiff | tree

Mitchell Wills [Tue, 30 Aug 2016 05:53:08 +0000 (05:53 +0000)]

DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework" am: 6a80a4b05a -s ours
am: 34c16ededb

Change-Id: I5ae3890b4f87ecdd7218b4963373ae107e721612

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:52:49 +0000 (05:52 +0000)]

Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev am: b9d4f91630 am: 79ecffe719
am: d522a6f630

Change-Id: Ie5e641af9d379b86409fbf1e346a9ac004231757

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:52:47 +0000 (05:52 +0000)]

Sanity check ICMP6 router advertisement packets am: a36213867a -s ours am: e39980689e
am: 008c82c10b

Change-Id: I15049d76d8ab742d6cea2b84d7c91bcad474c04f

commit | commitdiff | tree

Mitchell Wills [Tue, 30 Aug 2016 05:52:37 +0000 (05:52 +0000)]

DO NOT MERGE Revert "Add WiFi toggle prompts - framework" am: 8efb84e3e0 -s ours
am: 321b239f06

Change-Id: I6ada5c2ec3626d81d3b0660757428fa5a47580ee

commit | commitdiff | tree

Mitchell Wills [Tue, 30 Aug 2016 05:48:43 +0000 (05:48 +0000)]

DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"
am: 6a80a4b05a -s ours

Change-Id: I9e559ef064ba7316578b4b511d9b1bb420c18428

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:47:36 +0000 (05:47 +0000)]

Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev am: b9d4f91630
am: 79ecffe719

Change-Id: I0a347072ac9dc32013b41209ba6966d6ff4d26a2

commit | commitdiff | tree

Mitchell Wills [Tue, 30 Aug 2016 05:47:34 +0000 (05:47 +0000)]

DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
am: 8efb84e3e0 -s ours

Change-Id: I57c01ee74e3a4c6bdd85aacfde68ae553bc06cdf

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:47:33 +0000 (05:47 +0000)]

Sanity check ICMP6 router advertisement packets am: a36213867a -s ours
am: e39980689e

Change-Id: I2a18188cb1b8a1c3fe26c41eea72f4c3cc03a369

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:47:25 +0000 (05:47 +0000)]

Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev am: b9d4f91630
am: f17321066a

Change-Id: I727fdf55cb6bf85a848bdfb7e0dea06e6ddd9c35

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:47:22 +0000 (05:47 +0000)]

Sanity check ICMP6 router advertisement packets am: a36213867a
am: 504e737132 -s ours

Change-Id: I323499052d0bb38137939b2550c8869faf61243f

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:44:34 +0000 (05:44 +0000)]

Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
am: b9d4f91630

Change-Id: Ibea7e0328b1f7c74bf2edcc054cad2a54def905b

commit | commitdiff | tree

Paul Jensen [Tue, 30 Aug 2016 05:42:04 +0000 (05:42 +0000)]

Sanity check ICMP6 router advertisement packets
am: a36213867a -s ours

Change-Id: I8371809758391158effb378fae4b6fc9aaca553c

commit | commitdiff | tree

Pat Tjin [Tue, 30 Aug 2016 05:32:06 +0000 (05:32 +0000)]

Merge "BootReceiver: Report correct headers for last messages" into nyc-mr1-dev am: 6c0d81520b
am: e93bfe1f18

Change-Id: I426379e1d407c0d6cb836eabbddb1f98486ee98a

commit | commitdiff | tree

Patrick Tjin [Tue, 30 Aug 2016 05:31:58 +0000 (05:31 +0000)]

BootReceiver: Report correct headers for last messages am: 60c17395a6
am: 56734f96ec

Change-Id: Ieabeda97789d8aabc4e2aecb38ec5bc700061022

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help