OSDN Git Service

android-x86/frameworks-base.git
7 years agoNew Settings symbols for captive portal detection
Hugo Benichi [Thu, 29 Sep 2016 01:15:17 +0000 (01:15 +0000)]
New Settings symbols for captive portal detection
am: 92eb22fdd2

Change-Id: Id8c19f16c50b22034278c00b55c5431d892f8a95

7 years agoMerge "Captive portal detection uses 3rd fallback probe" into nyc-mr1-dev
Hugo Benichi [Thu, 29 Sep 2016 01:14:01 +0000 (01:14 +0000)]
Merge "Captive portal detection uses 3rd fallback probe" into nyc-mr1-dev
am: 434fa32f82

Change-Id: Ib98b908d37f56c9116984078cded599594c80b62

7 years agoCaptive portal detection uses 3rd fallback probe
Hugo Benichi [Thu, 29 Sep 2016 01:13:59 +0000 (01:13 +0000)]
Captive portal detection uses 3rd fallback probe
am: d953bf853d

Change-Id: I15607fbfae9dc127b72b6f299b69d6b648117338

7 years agoMerge "Captive portal detection uses 3rd fallback probe" into nyc-mr1-dev
Hugo Benichi [Thu, 29 Sep 2016 01:06:32 +0000 (01:06 +0000)]
Merge "Captive portal detection uses 3rd fallback probe" into nyc-mr1-dev

7 years agoMerge "Docs: Wear Preview - Release Notes and more" into nyc-dev am: 93d9d85bda am...
Bert McMeen [Thu, 29 Sep 2016 00:34:50 +0000 (00:34 +0000)]
Merge "Docs: Wear Preview - Release Notes and more" into nyc-dev am: 93d9d85bda am: a6f1ac93a4
am: e7925aa4a0

Change-Id: I46057f0cae4ed120c4d4e477cfeafc172cae1075

7 years agoDocs: Wear Preview - Release Notes and more am: 289e9c1d9f am: 58b364da66
Bert McMeen [Thu, 29 Sep 2016 00:33:47 +0000 (00:33 +0000)]
Docs: Wear Preview - Release Notes and more am: 289e9c1d9f am: 58b364da66
am: dd632a90b8

Change-Id: I251024d91280a8b10406246dd668928e2384ad6a

7 years agoMerge "Docs: Wear Preview - Release Notes and more" into nyc-dev am: 93d9d85bda
Bert McMeen [Thu, 29 Sep 2016 00:28:10 +0000 (00:28 +0000)]
Merge "Docs: Wear Preview - Release Notes and more" into nyc-dev am: 93d9d85bda
am: a6f1ac93a4

Change-Id: I66c0f80ae75c47ce963648915e7607b4a027296b

7 years agoDocs: Wear Preview - Release Notes and more am: 289e9c1d9f
Bert McMeen [Thu, 29 Sep 2016 00:26:58 +0000 (00:26 +0000)]
Docs: Wear Preview - Release Notes and more am: 289e9c1d9f
am: 58b364da66

Change-Id: Ib1d2cf915e119af6b59af053cb8ee8a94ba7ffb0

7 years agoMerge "Support WFC roaming preference" into nyc-mr1-dev
Meng Wang [Thu, 29 Sep 2016 00:22:35 +0000 (00:22 +0000)]
Merge "Support WFC roaming preference" into nyc-mr1-dev
am: cfe950f6be

Change-Id: Ia222c9d5826f873ba9d23b203d2ba88c5edf1e0d

7 years agoSupport WFC roaming preference
Meng Wang [Thu, 29 Sep 2016 00:22:01 +0000 (00:22 +0000)]
Support WFC roaming preference
am: 2c25e4a96b

Change-Id: I8a1af9756ddf5a4359cfd94aa6eebfdcb87b9e13

7 years agoMerge "Docs: Wear Preview - Release Notes and more" into nyc-dev
Bert McMeen [Thu, 29 Sep 2016 00:18:52 +0000 (00:18 +0000)]
Merge "Docs: Wear Preview - Release Notes and more" into nyc-dev
am: 93d9d85bda

Change-Id: I6fa5a223f0846ad1950fc11e5c5c69dbc54eb1e5

7 years agoDocs: Wear Preview - Release Notes and more
Bert McMeen [Thu, 29 Sep 2016 00:18:48 +0000 (00:18 +0000)]
Docs: Wear Preview - Release Notes and more
am: 289e9c1d9f

Change-Id: Ifc8e1147d45e293f87903c4e000b5fad5f5d282c

7 years agoMerge "Support WFC roaming preference" into nyc-mr1-dev
Meng Wang [Thu, 29 Sep 2016 00:13:49 +0000 (00:13 +0000)]
Merge "Support WFC roaming preference" into nyc-mr1-dev

7 years agoMerge "Docs: Wear Preview - Release Notes and more" into nyc-dev
Bert McMeen [Thu, 29 Sep 2016 00:07:27 +0000 (00:07 +0000)]
Merge "Docs: Wear Preview - Release Notes and more" into nyc-dev

7 years agoDocs: Wear Preview - Release Notes and more
Bert McMeen [Fri, 2 Sep 2016 21:06:16 +0000 (14:06 -0700)]
Docs: Wear Preview - Release Notes and more

Bug: 30570507
Change-Id: I4c89e9e6bcbbcff95a7dfac8869964092c8ef364

7 years agoMerge "AsyncTask terminating with exception calls onCancelled" into nyc-mr1-dev
Tony Mantler [Wed, 28 Sep 2016 23:34:16 +0000 (23:34 +0000)]
Merge "AsyncTask terminating with exception calls onCancelled" into nyc-mr1-dev
am: 647625fbf8

Change-Id: Ic325de894808a37cedb4ed0ecdc8d18982983813

7 years agoAsyncTask terminating with exception calls onCancelled
Tony Mantler [Wed, 28 Sep 2016 23:34:13 +0000 (23:34 +0000)]
AsyncTask terminating with exception calls onCancelled
am: 5eb91a437c

Change-Id: If17d5621b6813c1f02d533e853ad9b8865fdbc19

7 years agoMerge "AsyncTask terminating with exception calls onCancelled" into nyc-mr1-dev
Tony Mantler [Wed, 28 Sep 2016 23:25:51 +0000 (23:25 +0000)]
Merge "AsyncTask terminating with exception calls onCancelled" into nyc-mr1-dev

7 years agoMerge "DirectReply: Prevent closing the IME window on reinflation" into nyc-mr1-dev
Adrian Roos [Wed, 28 Sep 2016 23:16:24 +0000 (23:16 +0000)]
Merge "DirectReply: Prevent closing the IME window on reinflation" into nyc-mr1-dev
am: 6006a88e54

Change-Id: Iab06e3e6a4a9b7bf3e9360bcdee52a6be440298e

7 years agoDirectReply: Prevent closing the IME window on reinflation
Adrian Roos [Wed, 28 Sep 2016 23:16:21 +0000 (23:16 +0000)]
DirectReply: Prevent closing the IME window on reinflation
am: 7813dd7918

Change-Id: I8e94a12524999ad8712f7a0ef2b824fa57ac4f5c

7 years agoMerge "DirectReply: Prevent closing the IME window on reinflation" into nyc-mr1-dev
TreeHugger Robot [Wed, 28 Sep 2016 23:04:32 +0000 (23:04 +0000)]
Merge "DirectReply: Prevent closing the IME window on reinflation" into nyc-mr1-dev

7 years agoMerge "Docs: Complications additions and changes" into nyc-dev am: 754dfad475 am...
Bert McMeen [Wed, 28 Sep 2016 22:36:43 +0000 (22:36 +0000)]
Merge "Docs: Complications additions and changes" into nyc-dev am: 754dfad475 am: 78f8405a9b
am: 55d338f000

Change-Id: I1801719ed57fb8604911ef90a206cad498530575

7 years agoDocs: Complications additions and changes am: 5c7636218d am: 780d8b2c2b
Bert McMeen [Wed, 28 Sep 2016 22:35:51 +0000 (22:35 +0000)]
Docs: Complications additions and changes am: 5c7636218d am: 780d8b2c2b
am: 08317e4c18

Change-Id: Icc7435242b210930eb7968bd679bf761767bb3ab

7 years agoMerge "Docs: FDP3 pages for standalone apps" into nyc-dev am: 5f97d8e3cf am: 21aa30c3ca
Bert McMeen [Wed, 28 Sep 2016 22:35:10 +0000 (22:35 +0000)]
Merge "Docs: FDP3 pages for standalone apps" into nyc-dev am: 5f97d8e3cf am: 21aa30c3ca
am: a30f72d37c

Change-Id: Id38e6bd415448e2534d06ae7c546f35e5a9387da

7 years agoDocs: FDP3 pages for standalone apps am: 22109c72fb am: e15b0a2de2
Bert McMeen [Wed, 28 Sep 2016 22:34:16 +0000 (22:34 +0000)]
Docs: FDP3 pages for standalone apps am: 22109c72fb am: e15b0a2de2
am: a3fe50cb0b

Change-Id: I0bd33d76f9a9bfd2b97ac8e72859f50f839a7c13

7 years agoMerge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev am: 90150e...
Bert McMeen [Wed, 28 Sep 2016 22:33:15 +0000 (22:33 +0000)]
Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev am: 90150e0c68 am: a2adb69e92
am: 67089cf406

Change-Id: I25764bcb6bd317d9f9e3ee62bd88b83732a86959

7 years agoDocs: Preview 3 - Update to bridging of notifications am: 1c3bccceb2 am: f1947456d6
Bert McMeen [Wed, 28 Sep 2016 22:32:22 +0000 (22:32 +0000)]
Docs: Preview 3 - Update to bridging of notifications am: 1c3bccceb2 am: f1947456d6
am: d1f9d7e47d

Change-Id: I938bc05d1f55a39e6a72b31c9936ddbfb7db457c

7 years agoMerge "Docs: Complications additions and changes" into nyc-dev am: 754dfad475
Bert McMeen [Wed, 28 Sep 2016 22:29:25 +0000 (22:29 +0000)]
Merge "Docs: Complications additions and changes" into nyc-dev am: 754dfad475
am: 78f8405a9b

Change-Id: Ifcebf3c64b691c71d98f1052298e6cb35a77cec6

7 years agoDocs: Complications additions and changes am: 5c7636218d
Bert McMeen [Wed, 28 Sep 2016 22:28:38 +0000 (22:28 +0000)]
Docs: Complications additions and changes am: 5c7636218d
am: 780d8b2c2b

Change-Id: Iead55a6145f8f87acabdfbf9da077a55955f3d29

7 years agoMerge "Docs: FDP3 pages for standalone apps" into nyc-dev am: 5f97d8e3cf
Bert McMeen [Wed, 28 Sep 2016 22:27:40 +0000 (22:27 +0000)]
Merge "Docs: FDP3 pages for standalone apps" into nyc-dev am: 5f97d8e3cf
am: 21aa30c3ca

Change-Id: Ic60b56a1493367188ee43f92ae30e4a6a8dbeb3e

7 years agoDocs: FDP3 pages for standalone apps am: 22109c72fb
Bert McMeen [Wed, 28 Sep 2016 22:26:51 +0000 (22:26 +0000)]
Docs: FDP3 pages for standalone apps am: 22109c72fb
am: e15b0a2de2

Change-Id: I05d5cf5a8767d2eb5031d9e9ff16c1a74054291c

7 years agoMerge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev am: 90150e0c68
Bert McMeen [Wed, 28 Sep 2016 22:26:08 +0000 (22:26 +0000)]
Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev am: 90150e0c68
am: a2adb69e92

Change-Id: I8c5031245e9d732e7fa8203bbef7c02e4ec1112b

7 years agoDocs: Preview 3 - Update to bridging of notifications am: 1c3bccceb2
Bert McMeen [Wed, 28 Sep 2016 22:25:07 +0000 (22:25 +0000)]
Docs: Preview 3 - Update to bridging of notifications am: 1c3bccceb2
am: f1947456d6

Change-Id: I53ef864ed337d10b39b5e593a64c7c6863a85cbf

7 years agoMerge "docs: Added documentation for Inline action on notification stream and steps...
Sreevani Sreejith [Wed, 28 Sep 2016 22:20:23 +0000 (22:20 +0000)]
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev am: a0611bfd94 am: 51f1145a2b
am: 0c9e841f2a

Change-Id: I4d2d501e04fd58c258920db0b834c634bd68355b

7 years agodocs: Added documentation for Inline action on notification stream and steps for...
sreevanis [Wed, 28 Sep 2016 22:19:39 +0000 (22:19 +0000)]
docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. am: b00d08796b am: 5480deaad8
am: 05da9ee3f3

Change-Id: I560c2e2bb63945830be69f43cfee3bfdef9cee52

7 years agoMerge "Docs: Complications additions and changes" into nyc-dev
Bert McMeen [Wed, 28 Sep 2016 22:19:23 +0000 (22:19 +0000)]
Merge "Docs: Complications additions and changes" into nyc-dev
am: 754dfad475

Change-Id: Iabcad86121f0d40862588ff4f46fabb3dc1a08f2

7 years agoDocs: Complications additions and changes
Bert McMeen [Wed, 28 Sep 2016 22:19:20 +0000 (22:19 +0000)]
Docs: Complications additions and changes
am: 5c7636218d

Change-Id: If99792cb54a76edc7f307ab0a4f583ba810627f0

7 years agoMerge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc...
Sreevani Sreejith [Wed, 28 Sep 2016 22:18:43 +0000 (22:18 +0000)]
Merge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc am: e27e22b9e4
am: 37c9eb2da4

Change-Id: I350021f853c30f6232e7c7f11e6aba12a192399a

7 years agoMerge "Docs: FDP3 pages for standalone apps" into nyc-dev
Bert McMeen [Wed, 28 Sep 2016 22:18:00 +0000 (22:18 +0000)]
Merge "Docs: FDP3 pages for standalone apps" into nyc-dev
am: 5f97d8e3cf

Change-Id: I26d77a521f02a1191632f8df5d380bec820d8721

7 years agodocs: Documentation for WearableRecyclerView. am: 2d1a177045 am: 4dbcb9c66d
sreevanis [Wed, 28 Sep 2016 22:18:00 +0000 (22:18 +0000)]
docs: Documentation for WearableRecyclerView. am: 2d1a177045 am: 4dbcb9c66d
am: b9cfe89f01

Change-Id: Ie14c0bb2793883b571bd7c5ccd26a14139dfc081

7 years agoDocs: FDP3 pages for standalone apps
Bert McMeen [Wed, 28 Sep 2016 22:17:58 +0000 (22:17 +0000)]
Docs: FDP3 pages for standalone apps
am: 22109c72fb

Change-Id: I526af72a24b19ecb4c12259279cf9928500df6f1

7 years agoMerge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev
Bert McMeen [Wed, 28 Sep 2016 22:16:05 +0000 (22:16 +0000)]
Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev
am: 90150e0c68

Change-Id: Ic4e30589cc3d95c29afa19b47144ff784108780a

7 years agoDocs: Preview 3 - Update to bridging of notifications
Bert McMeen [Wed, 28 Sep 2016 22:16:03 +0000 (22:16 +0000)]
Docs: Preview 3 - Update to bridging of notifications
am: 1c3bccceb2

Change-Id: I1a1e46653fab53bf3883518e007334a68f6c5cf0

7 years agoMerge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842 am: 0d6d4a67f7
Sreevani Sreejith [Wed, 28 Sep 2016 22:14:38 +0000 (22:14 +0000)]
Merge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842 am: 0d6d4a67f7
am: 43d954ea70

Change-Id: I6903db9d815e10c8bfcd15caef4aadbceaf7fcc3

7 years agodocs:Added Wear partner logos. am: bfc1ba951e am: 52458ec6fc
sreevanis [Wed, 28 Sep 2016 22:13:43 +0000 (22:13 +0000)]
docs:Added Wear partner logos. am: bfc1ba951e am: 52458ec6fc
am: 5b5a5470c8

Change-Id: I715ceffe2d01ddd6f0bf1df041792040e991c7e8

7 years agoMerge "Docs: Complications additions and changes" into nyc-dev
Bert McMeen [Wed, 28 Sep 2016 22:11:42 +0000 (22:11 +0000)]
Merge "Docs: Complications additions and changes" into nyc-dev

7 years agoMerge "docs: Added documentation for Inline action on notification stream and steps...
Sreevani Sreejith [Wed, 28 Sep 2016 22:11:13 +0000 (22:11 +0000)]
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev am: a0611bfd94
am: 51f1145a2b

Change-Id: Ib6b1a29f81ad3ee89e0d5cd5d1f604d6b40f45cc

7 years agodocs: Added documentation for Inline action on notification stream and steps for...
sreevanis [Wed, 28 Sep 2016 22:10:14 +0000 (22:10 +0000)]
docs: Added documentation for Inline action on notification stream and steps for adding images to a notification. am: b00d08796b
am: 5480deaad8

Change-Id: Ibebadfa911fbc1a1624f78a8818de309eb3bb635

7 years agoMerge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc
Sreevani Sreejith [Wed, 28 Sep 2016 22:09:22 +0000 (22:09 +0000)]
Merge "docs: Documentation for WearableRecyclerView." into nyc-dev am: de101dfbdc
am: e27e22b9e4

Change-Id: I2c71a1c42c090f8bec3276e239c7f6ef86a15fd6

7 years agodocs: Documentation for WearableRecyclerView. am: 2d1a177045
sreevanis [Wed, 28 Sep 2016 22:08:27 +0000 (22:08 +0000)]
docs: Documentation for WearableRecyclerView. am: 2d1a177045
am: 4dbcb9c66d

Change-Id: Ie25e14e118b2a0734ccdc064d7522b035dc7afcc

7 years agoMerge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842
Sreevani Sreejith [Wed, 28 Sep 2016 22:07:40 +0000 (22:07 +0000)]
Merge "docs:Added Wear partner logos." into nyc-dev am: 9d5d25f842
am: 0d6d4a67f7

Change-Id: I76fb62083e2005c05b417534001bf6f370fd741f

7 years agoMerge "Docs: FDP3 pages for standalone apps" into nyc-dev
Bert McMeen [Wed, 28 Sep 2016 22:07:02 +0000 (22:07 +0000)]
Merge "Docs: FDP3 pages for standalone apps" into nyc-dev

7 years agodocs:Added Wear partner logos. am: bfc1ba951e
sreevanis [Wed, 28 Sep 2016 22:06:43 +0000 (22:06 +0000)]
docs:Added Wear partner logos. am: bfc1ba951e
am: 52458ec6fc

Change-Id: I74ebb658c6af1136c394ab0e4e7b396150b616bc

7 years agoMerge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev
Bert McMeen [Wed, 28 Sep 2016 22:06:00 +0000 (22:06 +0000)]
Merge "Docs: Preview 3 - Update to bridging of notifications" into nyc-dev

7 years agoMerge "docs: Added documentation for Inline action on notification stream and steps...
Sreevani Sreejith [Wed, 28 Sep 2016 22:01:32 +0000 (22:01 +0000)]
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev
am: a0611bfd94

Change-Id: Id43f71ba103e7b7eb4654427541f8989f0abc1fc

7 years agodocs: Added documentation for Inline action on notification stream and steps for...
sreevanis [Wed, 28 Sep 2016 22:01:30 +0000 (22:01 +0000)]
docs: Added documentation for Inline action on notification stream and steps for adding images to a notification.
am: b00d08796b

Change-Id: I7a891bebec11cc89182ef0a42be293a855b0945c

7 years agoMerge "docs: Documentation for WearableRecyclerView." into nyc-dev
Sreevani Sreejith [Wed, 28 Sep 2016 22:00:12 +0000 (22:00 +0000)]
Merge "docs: Documentation for WearableRecyclerView." into nyc-dev
am: de101dfbdc

Change-Id: I33d0e40c2ad1bf2c9b867ccf94e1aaecbd671543

7 years agodocs: Documentation for WearableRecyclerView.
sreevanis [Wed, 28 Sep 2016 22:00:08 +0000 (22:00 +0000)]
docs: Documentation for WearableRecyclerView.
am: 2d1a177045

Change-Id: I0f3306ada5d2fbae552cbef1860f20bc70b5c307

7 years agoMerge "docs:Added Wear partner logos." into nyc-dev
Sreevani Sreejith [Wed, 28 Sep 2016 21:58:50 +0000 (21:58 +0000)]
Merge "docs:Added Wear partner logos." into nyc-dev
am: 9d5d25f842

Change-Id: If538241f49f9aa74143e2a24dc644acc8ac119a9

7 years agodocs:Added Wear partner logos.
sreevanis [Wed, 28 Sep 2016 21:58:48 +0000 (21:58 +0000)]
docs:Added Wear partner logos.
am: bfc1ba951e

Change-Id: I3afb3d061da5966171dbe455c608a07cd0692172

7 years agoMerge "docs: Added documentation for Inline action on notification stream and steps...
Sreevani Sreejith [Wed, 28 Sep 2016 21:51:36 +0000 (21:51 +0000)]
Merge "docs: Added documentation for Inline action on notification stream and steps for adding images to a notification." into nyc-dev

7 years agoMerge "docs: Documentation for WearableRecyclerView." into nyc-dev
Sreevani Sreejith [Wed, 28 Sep 2016 21:50:37 +0000 (21:50 +0000)]
Merge "docs: Documentation for WearableRecyclerView." into nyc-dev

7 years agoMerge "docs:Added Wear partner logos." into nyc-dev
Sreevani Sreejith [Wed, 28 Sep 2016 21:50:10 +0000 (21:50 +0000)]
Merge "docs:Added Wear partner logos." into nyc-dev

7 years agoDirectReply: Prevent closing the IME window on reinflation
Adrian Roos [Sat, 24 Sep 2016 00:12:17 +0000 (17:12 -0700)]
DirectReply: Prevent closing the IME window on reinflation

Fixes a bug where the IME window would close if
the notification gets reinflated while direct reply
is open.

Change-Id: I37b8b29abe6b36c24e9a8bbf86f346523f1a4203
Fixes: 31181080
Test: manually; receive hangouts message, open direct reply, receive
      second message. Observe if IME closes.

7 years agoMerge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev
Eino-Ville Talvala [Wed, 28 Sep 2016 21:27:23 +0000 (21:27 +0000)]
Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev
am: 4e3bb26f64

Change-Id: Ice6815ac6922e53fa3ec3e7826cb9468dd4ce49d

7 years agoDngCreator: Do not cache timezone in static initializer
Eino-Ville Talvala [Wed, 28 Sep 2016 21:27:21 +0000 (21:27 +0000)]
DngCreator: Do not cache timezone in static initializer
am: ec727411d2

Change-Id: I86d207b7bfd156f5296aa3f5ba5acecd2d762d4e

7 years agoMerge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev
Vladislav Kuzkokov [Wed, 28 Sep 2016 21:26:02 +0000 (21:26 +0000)]
Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev
am: cd339f211a

Change-Id: I31dc7073d276b710d66cc977ee09cbfea2893e55

7 years agoFix logic in disabling BackupTransport in DO mode.
Vladislav Kuzkokov [Wed, 28 Sep 2016 21:26:00 +0000 (21:26 +0000)]
Fix logic in disabling BackupTransport in DO mode.
am: bbaadc0166

Change-Id: I89c0a7fb44bc50efedf2e8dc5eabaa4711b2687b

7 years agoMerge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev
Vladislav Kuzkokov [Wed, 28 Sep 2016 21:24:46 +0000 (21:24 +0000)]
Merge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev
am: a7d26d9171

Change-Id: Id44778f1808ac380f86633e932f7a6583502ce3d

7 years agoFix backup for users hit by erroneous backup disabling
Vladislav Kuzkokov [Wed, 28 Sep 2016 21:24:44 +0000 (21:24 +0000)]
Fix backup for users hit by erroneous backup disabling
am: 1975021d88

Change-Id: I4421e9642c2e89bf17535ef3212617d268c1c9d2

7 years agoMerge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev
Eino-Ville Talvala [Wed, 28 Sep 2016 21:20:18 +0000 (21:20 +0000)]
Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev

7 years agoAsyncTask terminating with exception calls onCancelled
Tony Mantler [Wed, 28 Sep 2016 20:55:15 +0000 (13:55 -0700)]
AsyncTask terminating with exception calls onCancelled

Test: cts/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
b/30304893

Change-Id: Icb50cda8026ddd70d457b5e62eb29c81313ee47d

7 years agoMerge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev
Vladislav Kuzkokov [Wed, 28 Sep 2016 21:15:06 +0000 (21:15 +0000)]
Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev

7 years agoMerge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev
Vladislav Kuzkokov [Wed, 28 Sep 2016 21:14:44 +0000 (21:14 +0000)]
Merge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev

7 years agoMerge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi...
Kevin Hufnagle [Wed, 28 Sep 2016 20:37:41 +0000 (20:37 +0000)]
Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev am: de85f4d045 am: 9c2b6aceb8
am: d36471009a

Change-Id: I5a47f6cec840f07f85f18af54ccf71a9306e8722

7 years agodocs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window...
Kevin Hufnagle [Wed, 28 Sep 2016 20:36:40 +0000 (20:36 +0000)]
docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page. am: b960272cc4 am: ca45197735
am: 511f442c41

Change-Id: Ie296e7e4c2744f37634b600fd392982db8e78e98

7 years agoMerge "docs: Fixed constants in manifest sample related to battery level." into nyc...
Kevin Hufnagle [Wed, 28 Sep 2016 20:35:48 +0000 (20:35 +0000)]
Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev am: cc717cdb01 am: f3f0edd59f
am: 69231463ab

Change-Id: Ic49f2612172c8009f37a93ab8f0f861ae10be5aa

7 years agodocs: Added documentation for Inline action on notification stream
sreevanis [Tue, 13 Sep 2016 23:17:35 +0000 (16:17 -0700)]
docs: Added documentation for Inline action on notification stream
and steps for adding images to a notification.

Bug:31012795
Change-Id: Ic7cbf1c2b8b5c2c7b18dadc95dd10c8b0d4add5b

7 years agodocs: Fixed constants in manifest sample related to battery level. am: d00481bef2...
Kevin Hufnagle [Wed, 28 Sep 2016 20:34:57 +0000 (20:34 +0000)]
docs: Fixed constants in manifest sample related to battery level. am: d00481bef2 am: 8d12a2a1c9
am: 7d8018e0d5

Change-Id: Ic593991c2c53f9f4754e97f618f2e6ddc8a53a61

7 years agoMerge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi...
Kevin Hufnagle [Wed, 28 Sep 2016 20:29:31 +0000 (20:29 +0000)]
Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev am: de85f4d045
am: 9c2b6aceb8

Change-Id: I949c7403b034d9a331e1b579f20ff3e45ebaf2d9

7 years agodocs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window...
Kevin Hufnagle [Wed, 28 Sep 2016 20:28:39 +0000 (20:28 +0000)]
docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page. am: b960272cc4
am: ca45197735

Change-Id: I01039b1fb34e2f5041ef80ad372f25dba73bf552

7 years agoMerge "docs: Fixed constants in manifest sample related to battery level." into nyc...
Kevin Hufnagle [Wed, 28 Sep 2016 20:22:35 +0000 (20:22 +0000)]
Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev am: cc717cdb01
am: f3f0edd59f

Change-Id: I94c74357fead76956c55f6479fecf49db52b6f21

7 years agodocs: Fixed constants in manifest sample related to battery level. am: d00481bef2
Kevin Hufnagle [Wed, 28 Sep 2016 20:21:45 +0000 (20:21 +0000)]
docs: Fixed constants in manifest sample related to battery level. am: d00481bef2
am: 8d12a2a1c9

Change-Id: Ic14678197693a1b8997a999b626784845c25127c

7 years agoMerge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi...
Kevin Hufnagle [Wed, 28 Sep 2016 20:17:11 +0000 (20:17 +0000)]
Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev
am: de85f4d045

Change-Id: Ib58c5bc8c6e74ae184ab448d0aad7176d11d0932

7 years agodocs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window...
Kevin Hufnagle [Wed, 28 Sep 2016 20:17:08 +0000 (20:17 +0000)]
docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page.
am: b960272cc4

Change-Id: I9fbc8c06dfd2c8aed47a0d84f73b48c50be205c0

7 years agoMerge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev
Kevin Hufnagle [Wed, 28 Sep 2016 20:15:48 +0000 (20:15 +0000)]
Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev
am: cc717cdb01

Change-Id: I9a90c173581e6058cd3d883f17f2b2d8aa72c4b8

7 years agodocs: Fixed constants in manifest sample related to battery level.
Kevin Hufnagle [Wed, 28 Sep 2016 20:15:45 +0000 (20:15 +0000)]
docs: Fixed constants in manifest sample related to battery level.
am: d00481bef2

Change-Id: I66559bea4c416170893587a737913b42197079c9

7 years agoMerge "Force APKs to be streamed" into nyc-mr1-dev
Todd Kennedy [Wed, 28 Sep 2016 20:13:41 +0000 (20:13 +0000)]
Merge "Force APKs to be streamed" into nyc-mr1-dev
am: 7c9aaa6ef6

Change-Id: Iea0b7f72bbce7cfccb796a9091aeeece9e493953

7 years agoForce APKs to be streamed
Todd Kennedy [Wed, 28 Sep 2016 20:13:38 +0000 (20:13 +0000)]
Force APKs to be streamed
am: e2d4f5fc31

Change-Id: I664df447803a22e8402ff354c10e1298d803fc3c

7 years agoMerge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi...
Kevin Hufnagle [Wed, 28 Sep 2016 20:09:56 +0000 (20:09 +0000)]
Merge "docs: Fixed broken link to "Picture-in-Picture" training guide within "Multi-Window Support" page." into nyc-dev

7 years agoMerge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev
Kevin Hufnagle [Wed, 28 Sep 2016 20:09:28 +0000 (20:09 +0000)]
Merge "docs: Fixed constants in manifest sample related to battery level." into nyc-dev

7 years agoMerge "Force APKs to be streamed" into nyc-mr1-dev
TreeHugger Robot [Wed, 28 Sep 2016 20:06:16 +0000 (20:06 +0000)]
Merge "Force APKs to be streamed" into nyc-mr1-dev

7 years agoDocs: Complications additions and changes
Bert McMeen [Wed, 31 Aug 2016 23:22:41 +0000 (16:22 -0700)]
Docs: Complications additions and changes

Bug: 28864917
Change-Id: I9551d30ee5fb4db9a77373b6445e145a5f4a3b11

7 years agoFix backup for users hit by erroneous backup disabling
Vladislav Kuzkokov [Wed, 28 Sep 2016 12:19:20 +0000 (14:19 +0200)]
Fix backup for users hit by erroneous backup disabling

BUG=31754835

Change-Id: I89dd08b7958dd8fe20d70bc50f2c89996ae46cc5

7 years agoMerge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev
Vadim Tryshev [Wed, 28 Sep 2016 19:14:07 +0000 (19:14 +0000)]
Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev
am: e7809891f7

Change-Id: I60e7db358928737faa427202a137bd036598bc61

7 years agoFixing html glitch in drag/drop docs.
Vadim Tryshev [Wed, 28 Sep 2016 19:14:05 +0000 (19:14 +0000)]
Fixing html glitch in drag/drop docs.
am: aed92d0547

Change-Id: I9fe6a7b9544bef4fe4f3ef03f39a3dd59d5cd7ac

7 years agoMerge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev
TreeHugger Robot [Wed, 28 Sep 2016 19:07:16 +0000 (19:07 +0000)]
Merge "Fixing html glitch in drag/drop docs." into nyc-mr1-dev

7 years agoFix logic in disabling BackupTransport in DO mode.
Vladislav Kuzkokov [Wed, 28 Sep 2016 11:15:40 +0000 (13:15 +0200)]
Fix logic in disabling BackupTransport in DO mode.

We were disabling backup in consumer mode as well.

BUG=31754835
TEST=android.content.pm.cts.shortcuthost.ShortcutManagerBackupTest

Change-Id: I42e5cfa512fda1b471eb62c7eb8bc346383da2fa

7 years agodocs:Added Wear partner logos.
sreevanis [Wed, 28 Sep 2016 18:16:56 +0000 (11:16 -0700)]
docs:Added Wear partner logos.

Bug:31364865
Change-Id: Iab45bd1d058a6fd407d546b69c0368d7a7c69015

7 years agoDngCreator: Do not cache timezone in static initializer
Eino-Ville Talvala [Wed, 28 Sep 2016 00:15:11 +0000 (17:15 -0700)]
DngCreator: Do not cache timezone in static initializer

The static initializer for a pre-loaded framework class is run
no later than at zygote startup, which happens at device boot.

Which means that if the timezone later changes, DngCreator will use
an incorrect cached timezone until the next reboot.  This is especially
evident in freshly wiped devices, where initial setup will typically
change the timezone.

Instead, read the timezone each time DngCreator is created, which is
also when we query the current time for constructing the timestamps.

Test: android.hardware.camera2.cts.DngCreatorTest#testSingleImageThumbnail
Bug: 31743060
Change-Id: I83a4eac762650e5f904f3b8fa779c094cef30562