OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "docs: Revised "activity launched with NFC intent" code sample to demonstrate...
Kevin Hufnagle [Mon, 26 Sep 2016 22:47:38 +0000 (22:47 +0000)]
Merge "docs: Revised "activity launched with NFC intent" code sample to demonstrate using onNewIntent() in these situations" into nyc-dev

7 years agoMerge "docs: Added note in LayoutTransition class reference that APPEARING and DISAPP...
Kevin Hufnagle [Mon, 26 Sep 2016 22:46:52 +0000 (22:46 +0000)]
Merge "docs: Added note in LayoutTransition class reference that APPEARING and DISAPPEARING animation timelines cannot overlap" into nyc-dev

7 years agoMerge "docs: Fixed broken link to Android KeyStore facility" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:46:19 +0000 (22:46 +0000)]
Merge "docs: Fixed broken link to Android KeyStore facility" into nyc-dev

7 years agoMerge "docs: Clarified definition of KeyEvent.Callback.onKeyMultiple()" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:45:59 +0000 (22:45 +0000)]
Merge "docs: Clarified definition of KeyEvent.Callback.onKeyMultiple()" into nyc-dev

7 years agoMerge "docs: Updated Android logo on "Brand Guidelines" page" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:45:34 +0000 (22:45 +0000)]
Merge "docs: Updated Android logo on "Brand Guidelines" page" into nyc-dev

7 years agoMerge "docs: Added recommendation to use jCenter dependency for Volley" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:43:32 +0000 (22:43 +0000)]
Merge "docs: Added recommendation to use jCenter dependency for Volley" into nyc-dev

7 years agoMerge "docs: Added "Play Games Quality" card to Distribute > Essentials page" into...
Kevin Hufnagle [Mon, 26 Sep 2016 22:42:48 +0000 (22:42 +0000)]
Merge "docs: Added "Play Games Quality" card to Distribute > Essentials page" into nyc-dev

7 years agoMerge "docs: Fixed typo in "Set Up App Indexing" resource card" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:42:05 +0000 (22:42 +0000)]
Merge "docs: Fixed typo in "Set Up App Indexing" resource card" into nyc-dev

7 years agoMerge "docs: Fixed variable naming error in code snippet for viewing a video" into...
Kevin Hufnagle [Mon, 26 Sep 2016 22:41:18 +0000 (22:41 +0000)]
Merge "docs: Fixed variable naming error in code snippet for viewing a video" into nyc-dev

7 years agoMerge "docs: Fixed typo in first paragraph of connectivity monitoring page" into...
Kevin Hufnagle [Mon, 26 Sep 2016 22:40:57 +0000 (22:40 +0000)]
Merge "docs: Fixed typo in first paragraph of connectivity monitoring page" into nyc-dev

7 years agoMerge "docs: Fixed example of ACTION_VIEW intent" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:40:12 +0000 (22:40 +0000)]
Merge "docs: Fixed example of ACTION_VIEW intent" into nyc-dev

7 years agoMerge "docs: Devices without SIMs use IP address for paid apps filtering" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:39:51 +0000 (22:39 +0000)]
Merge "docs: Devices without SIMs use IP address for paid apps filtering" into nyc-dev

7 years agoMerge "docs: Wi-Fi settings example now uses Settings constant correctly" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:36:37 +0000 (22:36 +0000)]
Merge "docs: Wi-Fi settings example now uses Settings constant correctly" into nyc-dev

7 years agoMerge "docs: Changed Android branding guidelines for clarity" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:36:15 +0000 (22:36 +0000)]
Merge "docs: Changed Android branding guidelines for clarity" into nyc-dev

7 years agoMerge "docs: Adjusted return value desc. for getApplicationEnabledSetting" into nyc-dev
Kevin Hufnagle [Mon, 26 Sep 2016 22:35:24 +0000 (22:35 +0000)]
Merge "docs: Adjusted return value desc. for getApplicationEnabledSetting" into nyc-dev

7 years agoMerge "change the Studio banner link from release notes to features" into nyc-dev
Scott Main [Mon, 26 Sep 2016 21:44:05 +0000 (21:44 +0000)]
Merge "change the Studio banner link from release notes to features" into nyc-dev

7 years agoMerge "Docs: Added contents for Vector Drawables" into nyc-docs
Hemal Patel [Mon, 26 Sep 2016 20:53:05 +0000 (20:53 +0000)]
Merge "Docs: Added contents for Vector Drawables" into nyc-docs
am: 342fe97eaa

Change-Id: Ie01dcbabeee24e67965ac527b13336e68fdff8f3

7 years agoDocs: Added contents for Vector Drawables
Hemal Patel [Mon, 26 Sep 2016 20:53:03 +0000 (20:53 +0000)]
Docs: Added contents for Vector Drawables
am: b4bab2d0ee

Change-Id: Ic7e9e869586e764896184ae0a3ba39d909b9702b

7 years agoMerge "Docs: Added contents for Vector Drawables" into nyc-docs
Hemal Patel [Mon, 26 Sep 2016 20:44:15 +0000 (20:44 +0000)]
Merge "Docs: Added contents for Vector Drawables" into nyc-docs

7 years agochange the Studio banner link from release notes to features
smain@google.com [Mon, 26 Sep 2016 19:49:52 +0000 (12:49 -0700)]
change the Studio banner link from release notes to features

Change-Id: I40cd1a4256f143957703d92b8a524bf8444dc56a

7 years agorevise Develop landing page banner for Studio 2.2
smain@google.com [Mon, 26 Sep 2016 19:18:30 +0000 (12:18 -0700)]
revise Develop landing page banner for Studio 2.2

Change-Id: I7eec3b72d09b87a56dfebd5391f9eac55dc26853

7 years agoupdate landing page banner for studio 2.2
smain@google.com [Thu, 22 Sep 2016 21:54:53 +0000 (14:54 -0700)]
update landing page banner for studio 2.2

Change-Id: Ibd22a8ac7e7d716ee169a6c8ddc67bb8f54e9337

7 years agoswitch utm_medium to utm_source
smain@google.com [Mon, 26 Sep 2016 17:23:13 +0000 (10:23 -0700)]
switch utm_medium to utm_source
fix a couple hashes
update the test recorder URL from TAC to DAC

Change-Id: Ia57823559e3629320e9562a585972ccb148fe07e

7 years agoMerge "docs: improve docs for sqlite package summary" into nyc-dev
Mark Lu [Mon, 26 Sep 2016 17:12:48 +0000 (17:12 +0000)]
Merge "docs: improve docs for sqlite package summary" into nyc-dev

7 years agoMerge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev
Mark Lu [Mon, 26 Sep 2016 17:12:29 +0000 (17:12 +0000)]
Merge "docs: Update docs for SQLiteDatabase replace methods" into nyc-dev

7 years agoMerge "Fixed a typo in the code sample" into nyc-dev
Mark Lu [Mon, 26 Sep 2016 17:11:54 +0000 (17:11 +0000)]
Merge "Fixed a typo in the code sample" into nyc-dev

7 years agoMerge "Docs: Fix missing space" into nyc-dev
TreeHugger Robot [Mon, 26 Sep 2016 15:22:54 +0000 (15:22 +0000)]
Merge "Docs: Fix missing space" into nyc-dev

7 years agoDocs: Added contents for Vector Drawables
Hemal Patel [Mon, 15 Aug 2016 21:31:42 +0000 (14:31 -0700)]
Docs: Added contents for Vector Drawables

Added contents to give an overview of VectorDrawables and
AnimatedVectorDrawables. For better understanding, added two graphic
files to explain the overall working of the XML file and the graphic
that is rendered as an output of the XML file.

Bug: 28072772
Change-Id: I9b6513c4b6e5aec59f45155963ff732fdd7b5784

7 years agoMerge "docs: update javadoc description for View.setVisibility() method" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:10:36 +0000 (22:10 +0000)]
Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev

7 years agoMerge "docs: update docs for uses-feature element" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:10:19 +0000 (22:10 +0000)]
Merge "docs: update docs for uses-feature element" into nyc-dev

7 years agoMerge "docs: Add param info to TextView.setTextColor" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 22:09:31 +0000 (22:09 +0000)]
Merge "docs: Add param info to TextView.setTextColor" into nyc-dev

7 years agoMerge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev
Mark Lu [Fri, 23 Sep 2016 21:47:27 +0000 (21:47 +0000)]
Merge "docs:  Mention SwitchCompat in Switch and toggle documentation" into nyc-dev

7 years agoMerge "docs: Removed two images that were moved to Piper in April" into nyc-dev
Andrew Solovay [Fri, 23 Sep 2016 21:15:28 +0000 (21:15 +0000)]
Merge "docs: Removed two images that were moved to Piper in April" into nyc-dev

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79...
Jaewan Kim [Thu, 22 Sep 2016 23:08:24 +0000 (23:08 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65  -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5
am: 5b649ddcc6  -s ours

Change-Id: I7de1101955e5152cd1fb5858ac93c9e94697b01b

7 years agoDO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am:...
Jaewan Kim [Thu, 22 Sep 2016 22:51:23 +0000 (22:51 +0000)]
DO NOT MERGE Fix build am: dfedca4e43  -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be  -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418
am: afab98a69e  -s ours

Change-Id: I8ddca6c69539eb9cc568e5fcec011a3c58450fcc

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79...
Jaewan Kim [Thu, 22 Sep 2016 22:40:32 +0000 (22:40 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65  -s ours am: 2cd4383c31 am: 09edfde074
am: 1ab448b5d5

Change-Id: I4a1da4793ef9c53447742ea9e1f7a34fbffb8807

7 years agoDO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am:...
Jaewan Kim [Thu, 22 Sep 2016 22:39:30 +0000 (22:39 +0000)]
DO NOT MERGE Fix build am: dfedca4e43  -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be  -s ours am: e9a9e2f055 am: 351aa0b320
am: 03bad07418

Change-Id: Ia687cf7aa14eb11452d390d47bc13ba4dfba0cda

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79...
Jaewan Kim [Thu, 22 Sep 2016 22:27:37 +0000 (22:27 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65  -s ours am: 2cd4383c31
am: 09edfde074

Change-Id: I8365e943aab82305fbc5775e8044dc7f014c0cdc

7 years agoDO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am:...
Jaewan Kim [Thu, 22 Sep 2016 22:26:12 +0000 (22:26 +0000)]
DO NOT MERGE Fix build am: dfedca4e43  -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be  -s ours am: e9a9e2f055
am: 351aa0b320

Change-Id: I4cfe42fedcde6f49f259686481bfe61660d02bfc

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79...
Jaewan Kim [Thu, 22 Sep 2016 22:21:52 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65  -s ours
am: 2cd4383c31

Change-Id: I0e6d2e4c60383c95a4a73bccfdb12472152e86a0

7 years agoDO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am:...
Jaewan Kim [Thu, 22 Sep 2016 22:20:54 +0000 (22:20 +0000)]
DO NOT MERGE Fix build am: dfedca4e43  -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be  -s ours
am: e9a9e2f055

Change-Id: Iaa0f0e473c9e2389c75c5d4dd9b4ff5e244ba442

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79...
Jaewan Kim [Thu, 22 Sep 2016 21:56:51 +0000 (21:56 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours am: ded4df2e79 am: 462493ee81
am: 585f642d65  -s ours

Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14

7 years agoDO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9
Jaewan Kim [Thu, 22 Sep 2016 21:55:51 +0000 (21:55 +0000)]
DO NOT MERGE Fix build am: dfedca4e43  -s ours am: 499871ebe9 am: 3ea1f124f9
am: ed3e26e2be  -s ours

Change-Id: Ie4fd67251243bba5f6c39320b752cd1cb9f8987e

7 years agodocs: Removed two images that were moved to Piper in April
Andrew Solovay [Thu, 22 Sep 2016 21:24:57 +0000 (14:24 -0700)]
docs: Removed two images that were moved to Piper in April

Scott had migrated these graphics to Piper in April, but they've
stayed in Gerrit. These graphics had been updated in Gerrit since
then, so they got out of sync with Piper.

Set up Critique CL cr/133998971 to migrate the latest versions
to Piper (and sent to Scott for review); setting up a separate
CL here to remove the files, so they won't accidentally get
edited in the wrong place again.

Change-Id: Ice9dda71ae3604b1fc3aab15746dc41e759b80a6

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 20:35:00 +0000 (20:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce  -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87
am: 832179120f  -s ours

Change-Id: Iefcfa52c1a34b05102c7188b3e7232584cffba53

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79
Jaewan Kim [Thu, 22 Sep 2016 20:34:22 +0000 (20:34 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours am: ded4df2e79
am: 462493ee81

Change-Id: I822c5aeb87aea023aa8dba38a4beb6de98225f4a

7 years agoDO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27...
Jaewan Kim [Thu, 22 Sep 2016 20:33:44 +0000 (20:33 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb  -s ours am: 8dffbcd169  -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237  -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890
am: 4da22f27f6  -s ours

Change-Id: Ie18197c55022197b4dcc9f8e2d45cb5cc78dcdd0

7 years agoDO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9
Jaewan Kim [Thu, 22 Sep 2016 20:33:24 +0000 (20:33 +0000)]
DO NOT MERGE Fix build am: dfedca4e43  -s ours am: 499871ebe9
am: 3ea1f124f9

Change-Id: I6762900887ed8ec6afb5b787fc3a2426b846a6c1

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 20:05:57 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce  -s ours am: 1c278e5652 am: bed7636243
am: dd883c7e87

Change-Id: Id9a90d8d49724435fced962b42a89edbb90846c3

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours
Jaewan Kim [Thu, 22 Sep 2016 20:05:49 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452  -s ours
am: ded4df2e79

Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61

7 years agoDO NOT MERGE Fix build am: dfedca4e43 -s ours
Jaewan Kim [Thu, 22 Sep 2016 20:03:57 +0000 (20:03 +0000)]
DO NOT MERGE Fix build am: dfedca4e43  -s ours
am: 499871ebe9

Change-Id: I7999092c3ba1df344f305b3e5d2befa65d1ad04a

7 years agoDO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27...
Jaewan Kim [Thu, 22 Sep 2016 20:03:53 +0000 (20:03 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb  -s ours am: 8dffbcd169  -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237  -s ours am: fa9983ec73 am: 900d1c90b3
am: 0e31d93890

Change-Id: I7f0dc285e10f6786137f6446dc77a53fe1549dfc

7 years agoMerge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
Ajay Panicker [Thu, 22 Sep 2016 19:56:50 +0000 (19:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9  -s ours am: 8919cc83bb  -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c  -s ours am: 0029d03c0a am: afeaced48f am: 2a214fc5f2
am: 0ec10c8fdc  -s ours

Change-Id: I66bfa158fdf948f36a98c20c3afc7ee7d73bb920

7 years agoMerge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
Ajay Panicker [Thu, 22 Sep 2016 19:23:06 +0000 (19:23 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9  -s ours am: 8919cc83bb  -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c  -s ours am: 0029d03c0a am: afeaced48f
am: 2a214fc5f2

Change-Id: I95bd7f14d35808722c0453e6e441d3bc96528010

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 19:01:08 +0000 (19:01 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce  -s ours am: 1c278e5652
am: bed7636243

Change-Id: I7d0fdb9db8a0593fe279a119751c17f940f88925

7 years agoDO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27...
Jaewan Kim [Thu, 22 Sep 2016 19:00:14 +0000 (19:00 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb  -s ours am: 8dffbcd169  -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237  -s ours am: fa9983ec73
am: 900d1c90b3

Change-Id: I03db2d87943557beb6a98aa72f986c1ad0f7f03d

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev
Jaewan Kim [Thu, 22 Sep 2016 18:09:45 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
am: fce3b76452  -s ours

Change-Id: Iea1a397f79856070d5f801193c71721a8ff69936

7 years agoDO NOT MERGE Fix build
Jaewan Kim [Thu, 22 Sep 2016 18:09:41 +0000 (18:09 +0000)]
DO NOT MERGE Fix build
am: dfedca4e43  -s ours

Change-Id: Ibf95b4c061129b2cd047e3b8a8da9f90cfea7e8f

7 years agoMerge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
Ajay Panicker [Thu, 22 Sep 2016 18:07:40 +0000 (18:07 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9  -s ours am: 8919cc83bb  -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c  -s ours am: 0029d03c0a
am: afeaced48f

Change-Id: I579d7384e9a12e942a0afcd80fc41e9f2877eedb

7 years agoMerge "DO NOT MERGE Fix build" into lmp-dev
Jaewan Kim [Thu, 22 Sep 2016 17:46:56 +0000 (17:46 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev

7 years agoDO NOT MERGE Fix build
Jaewan Kim [Thu, 22 Sep 2016 05:56:33 +0000 (14:56 +0900)]
DO NOT MERGE Fix build

Bug: 29833954
Change-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05

7 years agoCopy IN files to ID, temporarily leaving IN in place.
Dirk Dougherty [Thu, 22 Sep 2016 17:21:29 +0000 (10:21 -0700)]
Copy IN files to ID, temporarily leaving IN in place.

Change-Id: I1a92e4254fe57817cb555629059539aaec47e182

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 16:06:27 +0000 (16:06 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce  -s ours
am: 1c278e5652

Change-Id: I2486a6238a2595d7bd84b31916e22987ea2f98d5

7 years agoMerge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
Scott Main [Thu, 22 Sep 2016 15:22:38 +0000 (15:22 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev

7 years ago[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am...
Ajay Panicker [Thu, 22 Sep 2016 14:48:37 +0000 (14:48 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1  -s ours am: 7f84596929  -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994  -s ours am: bc12dda3a7 am: ffe6090f7e am: a71d1c416b
am: 081bea189d  -s ours

Change-Id: Ic3f72935e96e7b6f7b3a69474451d3edd418dd24

7 years agoDO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27...
Jaewan Kim [Thu, 22 Sep 2016 14:23:38 +0000 (14:23 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb  -s ours am: 8dffbcd169  -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237  -s ours
am: fa9983ec73

Change-Id: I5e9cb821711f13d536af5d3d5d42595f0e286559

7 years ago[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am...
Ajay Panicker [Thu, 22 Sep 2016 14:22:50 +0000 (14:22 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1  -s ours am: 7f84596929  -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994  -s ours am: bc12dda3a7 am: ffe6090f7e
am: a71d1c416b

Change-Id: Ib0ef4b276401795bbe64b35cf4caa9a173eaec21

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 13:58:30 +0000 (13:58 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours am: 890f53a486 am: 1bf809c490
am: 6ad7c0f6ce  -s ours

Change-Id: I71157581308c3ef4be7dad8db5c7d9a637a24320

7 years agoMerge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
Ajay Panicker [Thu, 22 Sep 2016 13:33:07 +0000 (13:33 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9  -s ours am: 8919cc83bb  -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c  -s ours
am: 0029d03c0a

Change-Id: Ia40c8390390d5612ad53c649d14516871bfba8e9

7 years ago[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am...
Ajay Panicker [Thu, 22 Sep 2016 13:32:52 +0000 (13:32 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1  -s ours am: 7f84596929  -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994  -s ours am: bc12dda3a7
am: ffe6090f7e

Change-Id: I6d48f72f00bd10d6013753db78883cec67c68568

7 years agoDO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27...
Jaewan Kim [Thu, 22 Sep 2016 13:31:57 +0000 (13:31 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb  -s ours am: 8dffbcd169  -s ours am: f140f796ea am: 7eaeeb49bb
am: 7ffaaca237  -s ours

Change-Id: I1db1ad50bfd89c038f9d226109958011aeb1496e

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 13:10:13 +0000 (13:10 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours am: 890f53a486
am: 1bf809c490

Change-Id: I0a316929c7654f89e435ac459bc9175434136f99

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 12:29:19 +0000 (12:29 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours am: 5ac79fa0a1  -s ours
am: 890f53a486

Change-Id: I7f85d8785ce8829cb9d01a23413c545f5e5a769a

7 years agoMerge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
Ajay Panicker [Thu, 22 Sep 2016 12:28:51 +0000 (12:28 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9  -s ours am: 8919cc83bb  -s ours am: 0241b6d88a am: 0fee65e58b
am: 08fed21f2c  -s ours

Change-Id: I2e790e95077c0760d1be6d984e7e90fb62a3d9db

7 years ago[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am...
Ajay Panicker [Thu, 22 Sep 2016 11:58:28 +0000 (11:58 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1  -s ours am: 7f84596929  -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994  -s ours
am: bc12dda3a7

Change-Id: Ib99bfa28add599f964b1b669de22fd653e42b02a

7 years agoMerge "DO NOT MERGE Check caller for sending media key to global priority session...
Jaewan Kim [Thu, 22 Sep 2016 11:22:51 +0000 (11:22 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e  -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d  -s ours am: 298c104ae5 am: d9e8bfb8cf am: 8cb7a9fdb0
am: a13096f4c5  -s ours

Change-Id: I5b9a7bb6faae813c9b4f6beeb8f96dfb5ad3cc3b

7 years agoDO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27...
Jaewan Kim [Thu, 22 Sep 2016 11:21:01 +0000 (11:21 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb  -s ours am: 8dffbcd169  -s ours am: f140f796ea
am: 7eaeeb49bb

Change-Id: I21b359b1471ee527a2bc975c399253def98e40fe

7 years agoDO NOT MERGE Check caller for sending media key to global priority session am: 4e9af3...
Jaewan Kim [Thu, 22 Sep 2016 10:59:39 +0000 (10:59 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4  -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1  -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5
am: 9632afe809  -s ours

Change-Id: I68e31867b8c925717eda87a426add614f731f77a

7 years agoMerge "DO NOT MERGE Check caller for sending media key to global priority session...
Jaewan Kim [Thu, 22 Sep 2016 10:58:44 +0000 (10:58 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06  -s ours am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81
am: b6d6519e34  -s ours

Change-Id: Idda087e0cbccf3e94dd23a41156cdcc14a4b2459

7 years agoDO NOT MERGE Check caller for sending media key to global priority session am: 6a1567...
Jaewan Kim [Thu, 22 Sep 2016 10:57:53 +0000 (10:57 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c  -s ours am: 30d1440861 am: ba1d8300be am: 016d110993
am: 1adff2ee05  -s ours

Change-Id: I99f14369c3f5f4388a17b85720a45bde8ee4c5be

7 years agoMerge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
Ajay Panicker [Thu, 22 Sep 2016 10:56:50 +0000 (10:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d  -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed  -s ours am: d4fe288933 am: f65661939b am: 630d577349
am: c9830d56e5  -s ours

Change-Id: Iaae899eeea3c9c95ebcd7654e6fb5a89d7f1ed90

7 years ago[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am...
Ajay Panicker [Thu, 22 Sep 2016 10:55:43 +0000 (10:55 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9  -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157  -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708
am: 90eafb5322  -s ours

Change-Id: I21edab5680d1cc4f5afa74ab9764f0ff945a44cc

7 years agoMerge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
Ajay Panicker [Thu, 22 Sep 2016 10:54:53 +0000 (10:54 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9  -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1
am: 05cd9942d9  -s ours

Change-Id: Iedd8920de15034413968efa125fa544b5a25e87c

7 years ago[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am...
Ajay Panicker [Thu, 22 Sep 2016 10:53:39 +0000 (10:53 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16  -s ours am: c56c079470 am: 1783182332 am: 993015ce9a
am: 8e172c638d  -s ours

Change-Id: I6ed9ac6f79a853f08fbc3105cade0d47033701f0

7 years agoMerge "DO NOT MERGE Check caller for sending media key to global priority session...
Jaewan Kim [Thu, 22 Sep 2016 10:52:37 +0000 (10:52 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102
am: 5decf8e715  -s ours

Change-Id: I79036440c10f32b4a30fbefa3a3ff65ebd9fc69e

7 years agoMerge "DO NOT MERGE Check caller for sending media key to global priority session...
Jaewan Kim [Thu, 22 Sep 2016 10:52:34 +0000 (10:52 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e  -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d  -s ours am: 298c104ae5 am: d9e8bfb8cf
am: 8cb7a9fdb0

Change-Id: Ib54fc420bb43c312f72f5c72bb38b97550db9da9

7 years agoMerge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...
Ajay Panicker [Thu, 22 Sep 2016 09:53:30 +0000 (09:53 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9  -s ours am: 8919cc83bb  -s ours am: 0241b6d88a
am: 0fee65e58b

Change-Id: I6e5bb9fea57cf5fe9cff68952d6b2878ce005d7c

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 09:38:16 +0000 (09:38 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059  -s ours
am: 5ac79fa0a1  -s ours

Change-Id: I02b22b773537b4c37893114f85714c32de5035a2

7 years ago[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am...
Ajay Panicker [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1  -s ours am: 7f84596929  -s ours am: ed82c6fac8 am: c1f8a09c1e
am: 8091a00994  -s ours

Change-Id: I51723f883566989133b0c8be92108b8c910c0981

7 years agoDO NOT MERGE Check caller for sending media key to global priority session am: 4e9af3...
Jaewan Kim [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4  -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1  -s ours am: 8d14f464b5 am: f595add2ff
am: e1e6f0a7f5

Change-Id: I373b66ee022f14d331729531c450eb18f8572d9b

7 years agoMerge "DO NOT MERGE Check caller for sending media key to global priority session...
Jaewan Kim [Thu, 22 Sep 2016 09:37:34 +0000 (09:37 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e  -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d  -s ours am: 298c104ae5
am: d9e8bfb8cf

Change-Id: I3f09cc3c507244d1999ed280002e1354d25db9d2

7 years agoDO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27...
Jaewan Kim [Thu, 22 Sep 2016 09:35:44 +0000 (09:35 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb  -s ours am: 8dffbcd169  -s ours
am: f140f796ea

Change-Id: I8db6ebc6704a60d44739e873038403c2740304e3

7 years agoMerge "DO NOT MERGE Check caller for sending media key to global priority session...
Jaewan Kim [Thu, 22 Sep 2016 09:14:33 +0000 (09:14 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06  -s ours am: 91ccfa1def am: 4167620d33
am: 2c9ad0ff81

Change-Id: I57e8a4e6b415683cba317afa012880b8ac12bff6

7 years agoMerge "DO NOT MERGE Check caller for sending media key to telephony service" into...
Jaewan Kim [Thu, 22 Sep 2016 09:13:35 +0000 (09:13 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894
am: 84ecab6059  -s ours

Change-Id: I077206cbba5614e52046cbbbf6e40544c3e25f92

7 years agoDO NOT MERGE Check caller for sending media key to global priority session am: 6a1567...
Jaewan Kim [Thu, 22 Sep 2016 09:13:26 +0000 (09:13 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c  -s ours am: 30d1440861 am: ba1d8300be
am: 016d110993

Change-Id: I6a216c2e2ddb6b9959e9691c5014c0d29b6c453d

7 years agoDO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27...
Jaewan Kim [Thu, 22 Sep 2016 09:13:22 +0000 (09:13 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb  -s ours
am: 8dffbcd169  -s ours

Change-Id: Ida4217e4a0392c2f58b1ef3d0229bad4229c838d

7 years agoDO NOT MERGE Check caller for sending media key to global priority session am: 4e9af3...
Jaewan Kim [Thu, 22 Sep 2016 09:13:16 +0000 (09:13 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4  -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1  -s ours am: 8d14f464b5
am: f595add2ff

Change-Id: I9d7b96411a566e6fa4ad4c8d263140245b427b44

7 years agoMerge "DO NOT MERGE Check caller for sending media key to global priority session...
Jaewan Kim [Thu, 22 Sep 2016 08:45:58 +0000 (08:45 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e  -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d  -s ours
am: 298c104ae5

Change-Id: Id2538e101907fe6a3dc5cb284ecf93a392a047ba

7 years agoDO NOT MERGE Check caller for sending media key to global priority session am: 4e9af3...
Jaewan Kim [Thu, 22 Sep 2016 08:45:03 +0000 (08:45 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4  -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1  -s ours
am: 8d14f464b5

Change-Id: Id6f3783a23706efaa7f389deb84e69c69fab501a

7 years agoMerge "DO NOT MERGE Check caller for sending media key to global priority session...
Jaewan Kim [Thu, 22 Sep 2016 08:08:16 +0000 (08:08 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06  -s ours am: 91ccfa1def
am: 4167620d33

Change-Id: I1af888ef60ff3920e1b63a421e432319bdefdb3e