OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into...
Julius D'souza [Wed, 4 Jan 2017 22:59:57 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev

7 years agodocs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am...
Kevin Hufnagle [Wed, 4 Jan 2017 01:41:25 +0000 (01:41 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7 am: d7c1e9bcd0
am: fb99d1450d

Change-Id: Ibe527fb777ca3975fed67a951f2ddb8f2b81a833

7 years agodocs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am...
Kevin Hufnagle [Wed, 4 Jan 2017 01:37:00 +0000 (01:37 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7
am: d7c1e9bcd0

Change-Id: I7f9ce1b661f8defca2918eece234a9c26d5f08a3

7 years agodocs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am...
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:24 +0000 (01:32 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50
am: c32df53fc7

Change-Id: Ib2ac681a13b8d3b80feba803f25fdc8dbdcfe4f9

7 years agoMerge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev...
Kevin Hufnagle [Wed, 4 Jan 2017 01:29:30 +0000 (01:29 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am: dbe9b81ef5 am: 2ff9c02bdc
am: b7c9651555

Change-Id: I8c06b2b162ca5837ba9157ef91bb5a8d1489e36a

7 years agodocs: Added descriptions of IAB subscription-specific settings. am: 145b377b38
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:19 +0000 (01:28 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38
am: 4418907d50

Change-Id: I486f53410a427f373daec719bac522289d812e7a

7 years agodocs: Added note - test subscriptions cannot use reserved IDs am: 98a11580ef am:...
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:17 +0000 (01:28 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am: 98a11580ef am: c8ccc66e85
am: 1c85b504e2

Change-Id: Iabd407dce1b3f01da5bbbd576536d0b77415d300

7 years agoMerge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev...
Kevin Hufnagle [Wed, 4 Jan 2017 01:25:12 +0000 (01:25 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am: dbe9b81ef5
am: 2ff9c02bdc

Change-Id: I930313b754635e07b190793c3b79de39b71b6b8a

7 years agodocs: Added descriptions of IAB subscription-specific settings.
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:24 +0000 (01:24 +0000)]
docs: Added descriptions of IAB subscription-specific settings.
am: 145b377b38

Change-Id: I1b7a0885f613beb9b7baba8a6b35b59f00989ff3

7 years agodocs: Added note - test subscriptions cannot use reserved IDs am: 98a11580ef
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:23 +0000 (01:24 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am: 98a11580ef
am: c8ccc66e85

Change-Id: Id17c38ec7f6b85bcbfaaf676bf3a2f1414fca893

7 years agoMerge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:51 +0000 (01:18 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
am: dbe9b81ef5

Change-Id: Ie08ac386f441b16451538e21dcc8d5e5052258b0

7 years agodocs: Added note - test subscriptions cannot use reserved IDs
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:47 +0000 (01:18 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs
am: 98a11580ef

Change-Id: I2c44d24b772d3df80dabab418875a1e9842aebbf

7 years agoMerge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
Kevin Hufnagle [Wed, 4 Jan 2017 01:14:21 +0000 (01:14 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev

7 years agoMerge "In permission review mode, always request user's consent to toggle BT." into...
Ivan Podogov [Tue, 3 Jan 2017 11:00:49 +0000 (11:00 +0000)]
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 11:06:56 +0000 (11:06 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814
am: 596e3a9d1a

Change-Id: If8e61075126f4b8a5ccf5a29e2bd74fec222f2f6

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9...
Charles He [Thu, 29 Dec 2016 11:05:43 +0000 (11:05 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2
am: b75b025578

Change-Id: Iff7b172dafedff0dcca720c4e7ca1c16e8c6a35c

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am...
Charles He [Thu, 29 Dec 2016 11:04:37 +0000 (11:04 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4
am: 835c1bcedb

Change-Id: Ia49ac04fb87b215fc52b0dd40d917f2aab045745

7 years agoPrevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d...
Charles He [Thu, 29 Dec 2016 11:03:26 +0000 (11:03 +0000)]
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad
am: 9bc2d6b446

Change-Id: I7e5794885bf78dfd1d755a7fdb0b1edf66b9fdee

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 10:58:44 +0000 (10:58 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04
am: b07ddf3814

Change-Id: I5fc69e1d8e02e405ae9ca8362a5c1f6312b4f53e

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9...
Charles He [Thu, 29 Dec 2016 10:57:41 +0000 (10:57 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc
am: e426dac4e2

Change-Id: I6451344efe089a7ff5de2082a9b8b77661c49ab7

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am...
Charles He [Thu, 29 Dec 2016 10:56:32 +0000 (10:56 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216
am: c189f23dd4

Change-Id: I8426e0788ce1dcb12daac23e82663284633cae5b

7 years agoPrevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d...
Charles He [Thu, 29 Dec 2016 10:55:23 +0000 (10:55 +0000)]
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f
am: dd7837c5ad

Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 10:44:41 +0000 (10:44 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf
am: 0e2e913b04

Change-Id: I02047ef2536a6a77df84e1b203d3b5ee55439e32

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9...
Charles He [Thu, 29 Dec 2016 10:43:40 +0000 (10:43 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c
am: 3cc7f6acdc

Change-Id: I98e65fcf8180e5187a92e8d5b888eb794f89ab6d

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am...
Charles He [Thu, 29 Dec 2016 10:42:32 +0000 (10:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15
am: 03fa83e216

Change-Id: I8f10fcf6b604848f68ecc086dd3723841e07ef8c

7 years agoPrevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d...
Charles He [Thu, 29 Dec 2016 10:41:25 +0000 (10:41 +0000)]
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0
am: 8bcdab7e6f

Change-Id: I6e41bfad4ce66ca80bca636a5fb4ddc85b71e83a

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 10:37:45 +0000 (10:37 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb
am: 1d84f619bf

Change-Id: Ic189edc98c3079ca98b258d08a5821b9c97dc027

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9...
Charles He [Thu, 29 Dec 2016 10:36:32 +0000 (10:36 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089
am: ced5ab190c

Change-Id: I59602f83fd659ce5192636d0e66feae217997d7c

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am...
Charles He [Thu, 29 Dec 2016 10:35:19 +0000 (10:35 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5
am: 6bb6f02a15

Change-Id: I849811a3be2c6989edea3ed6f938b4b36a4fabe7

7 years agoPrevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d...
Charles He [Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)]
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9
am: 9a47fa7fc0

Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 10:28:57 +0000 (10:28 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b
am: 5c74a1e9bb

Change-Id: Ie15d3c1927f17a36ed6d6bbe4b96c986536be3c7

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9...
Charles He [Thu, 29 Dec 2016 10:27:52 +0000 (10:27 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8
am: 0cc0219089

Change-Id: Id72d64d9356e362f35062bc6e45071b2be308558

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am...
Charles He [Thu, 29 Dec 2016 10:26:51 +0000 (10:26 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd
am: e15e0de7e5

Change-Id: I12af619f1fce710f643387dca3e06c1c4b5258d3

7 years agoPrevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d...
Charles He [Thu, 29 Dec 2016 10:25:50 +0000 (10:25 +0000)]
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882
am: e5156ec1e9

Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 10:21:47 +0000 (10:21 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad
am: f027831c6b

Change-Id: I49d10d41d5b89c97a2f418ccaed44eeae720bb22

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9...
Charles He [Thu, 29 Dec 2016 10:20:47 +0000 (10:20 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2
am: 76ca2da7e8

Change-Id: I9e20b2954ccb462cee31cb5ea44986c00afadbff

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am...
Charles He [Thu, 29 Dec 2016 10:19:49 +0000 (10:19 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7
am: b64af9bacd

Change-Id: I261c46544e8e1aef26772d57475037810198e4d9

7 years agoPrevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d...
Charles He [Thu, 29 Dec 2016 10:18:49 +0000 (10:18 +0000)]
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611
am: 00a581f882

Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 10:14:26 +0000 (10:14 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d
am: a1d59972ad

Change-Id: I027ab6594b563204515677fca9c256251b7067cd

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9...
Charles He [Thu, 29 Dec 2016 10:13:27 +0000 (10:13 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f
am: 6aa436bef2

Change-Id: I994b2fe070091a32beffff9dbf11b907b7878fe8

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am...
Charles He [Thu, 29 Dec 2016 10:12:24 +0000 (10:12 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92
am: d7f2a4b0c7

Change-Id: I3019f9751b69809d3cb66061753f0b76085b235b

7 years agoPrevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d
Charles He [Thu, 29 Dec 2016 10:11:20 +0000 (10:11 +0000)]
Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d
am: 133ff4d611

Change-Id: I54b163f645f561243aac3df1a55c1023531997b3

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 10:07:20 +0000 (10:07 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b
am: 1422a6074d

Change-Id: I2f3bf02f57c5f00964e645321467977b4ef498a7

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9
Charles He [Thu, 29 Dec 2016 10:06:14 +0000 (10:06 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9
am: d0339c6e8f

Change-Id: I0dbec3edf704821eb4605a48b770461eb99ddae7

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am...
Charles He [Thu, 29 Dec 2016 10:05:02 +0000 (10:05 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888
am: a8484b4f92

Change-Id: Id5a9576ab6e37e3744a59d904909d11f668d0e06

7 years agoPrevent writing to FRP partition during factory reset. am: a9437bd1ca
Charles He [Thu, 29 Dec 2016 10:03:53 +0000 (10:03 +0000)]
Prevent writing to FRP partition during factory reset. am: a9437bd1ca
am: 2ce5c4320d

Change-Id: I29339a634fd22cd46bfc08619464da8fe159a2b7

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 09:50:26 +0000 (09:50 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
am: 63a27d773b

Change-Id: I01d332678c1c3fe57ed36062a9ed01b5f368a55d

7 years agoAdd @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
Charles He [Thu, 29 Dec 2016 09:50:20 +0000 (09:50 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
am: 71d2a41dd9

Change-Id: Iab575b1efdd720c9cf9e32e0b056c99eff98deab

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
Charles He [Thu, 29 Dec 2016 09:48:50 +0000 (09:48 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
am: 4bd97eb888

Change-Id: I607f7ca9e160c4eed69a5baeff6b31d6db7c6b03

7 years agoPrevent writing to FRP partition during factory reset.
Charles He [Thu, 29 Dec 2016 09:48:45 +0000 (09:48 +0000)]
Prevent writing to FRP partition during factory reset.
am: a9437bd1ca

Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9

7 years agoMerge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into...
Charles He [Thu, 29 Dec 2016 09:43:10 +0000 (09:43 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev

7 years agoMerge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
Charles He [Thu, 29 Dec 2016 09:42:25 +0000 (09:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev

7 years agoMerge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc...
Andrew Solovay [Wed, 28 Dec 2016 20:24:34 +0000 (20:24 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
am: 61dad4b2fc

Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773

7 years ago[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
Andrew Solovay [Wed, 28 Dec 2016 20:24:30 +0000 (20:24 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am: 40ba793b33

Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f

7 years agoMerge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc...
Andrew Solovay [Wed, 28 Dec 2016 20:16:26 +0000 (20:16 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 18:04:44 +0000 (18:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e
am: 3b7d90c024

Change-Id: I46c1bf565b04175c8c97c9faeceed55bda41dbde

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:59:47 +0000 (17:59 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f
am: 2da05d0f9e

Change-Id: I8c94a06f5fa722312436484609bafcb0585d6d18

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:54:44 +0000 (17:54 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6
am: 7cec76de0f

Change-Id: I9168d45717c26e71bb356dd7304276e23c519bd9

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:44:46 +0000 (17:44 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51
am: 56098f81b6

Change-Id: I14fcacaede569580c8ca8e5bbbebb408ddcce76a

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:39:18 +0000 (17:39 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc
am: 1ac8affd51

Change-Id: I965c900e266a9189c595612cef6ddac839498949

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:34:11 +0000 (17:34 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66
am: d82f8a67fc

Change-Id: I25e43680e464c5169e8a5b9e8151b0dab2d2cf86

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:29:05 +0000 (17:29 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2
am: 1f458fdc66

Change-Id: I61d4b25ee0264397693f30e2091997c058d0c5fc

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:23:39 +0000 (17:23 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344
am: d28eef0cc2

Change-Id: If937d91cee2bb06406cf3cd1ae6ac3402a51e88d

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:19:10 +0000 (17:19 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b
am: 1684e5f344

Change-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:14:05 +0000 (17:14 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516
am: 0a8978f04b

Change-Id: I693665a57465ec57f946fad57cda9ce48389408f

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:09:09 +0000 (17:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872
am: 3380a77516

Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e
Tom O'Neill [Thu, 22 Dec 2016 17:04:07 +0000 (17:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e
am: d417e54872

Change-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db

7 years agoFix exploit where can hide the fact that a location was mocked
Tom O'Neill [Thu, 22 Dec 2016 16:58:33 +0000 (16:58 +0000)]
Fix exploit where can hide the fact that a location was mocked
am: a206a0f17e

Change-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4

7 years agoMerge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
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

7 years agodocs: remove implicit intent from bindService and startService
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

7 years agodocs: update Paint.setTextSize() to indicate pixel units
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

7 years agoMerge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
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

7 years agoMerge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
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

7 years agodocs: remove implicit intent from bindService and startService
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

7 years agodocs: update Paint.setTextSize() to indicate pixel units
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

7 years agodocs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am...
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

7 years agodocs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e
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

7 years agodocs: Add deprecation message for the developer.android.com docs
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

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
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

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
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

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
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

7 years agodocs: Add deprecation message for the developer.android.com docs
Joe Fernandez [Sat, 17 Dec 2016 02:20:56 +0000 (18:20 -0800)]
docs: Add deprecation message for the developer.android.com docs

Change-Id: Ia091df49099482696abbc3a596cf1787ca904d67

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
Mark Lu [Sat, 17 Dec 2016 02:19:55 +0000 (02:19 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
am: 88e64bb739

Change-Id: Idcaf2dabd54d5fc07cce825e44237ddb3fc0e51f

7 years agodocs: update description for BitmapFactory.Options#inBitmap
Mark Lu [Sat, 17 Dec 2016 02:19:51 +0000 (02:19 +0000)]
docs: update description for BitmapFactory.Options#inBitmap
am: a8f4286272

Change-Id: I163f1f5f8a9d688407aa7c0d76895bf18efa3430

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
Mark Lu [Sat, 17 Dec 2016 02:04:23 +0000 (02:04 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev

7 years agodocs: update description for BitmapFactory.Options#inBitmap
Mark Lu [Fri, 16 Dec 2016 23:43:27 +0000 (15:43 -0800)]
docs: update description for BitmapFactory.Options#inBitmap

bug: 18730109
Change-Id: Iab062d41af3a32208d3500179d3737278a035188

7 years agoFix OnCancelListener for Dialogs on swipe to dismiss.
Michael Kwan [Fri, 16 Dec 2016 20:38:10 +0000 (12:38 -0800)]
Fix OnCancelListener for Dialogs on swipe to dismiss.

Swipe to dismiss on dialogs did not dispatch onCancel events
to OnCancelListeners. Resolve by adding listener to monitor
swipe to dismiss events and dispatch onCancel events when
that occurs.

Bug: 33663411
Change-Id: I64ff29e008d485a4559eb3d1ff7f0e74dccff404

7 years agoIn permission review mode, always request user's consent to toggle BT.
Ivan Podogov [Mon, 5 Dec 2016 16:46:52 +0000 (16:46 +0000)]
In permission review mode, always request user's consent to toggle BT.

Bug: 33155221
Change-Id: Ic1ed987bbaf282892a2aef354a8ca0add2c829ba

7 years agoMerge "docs: changes to broadcast documentation" into nyc-mr1-dev
Mark Lu [Fri, 16 Dec 2016 04:59:10 +0000 (04:59 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
am: 7b22d549d4

Change-Id: I41ac74d65f48258c21afcbd39bf1eb518976a5f2

7 years agodocs: changes to broadcast documentation
Mark Lu [Fri, 16 Dec 2016 04:59:08 +0000 (04:59 +0000)]
docs: changes to broadcast documentation
am: 33ec106d22

Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987

7 years agoMerge "docs: changes to broadcast documentation" into nyc-mr1-dev
Mark Lu [Fri, 16 Dec 2016 04:48:36 +0000 (04:48 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
Svet Ganov [Thu, 15 Dec 2016 22:51:17 +0000 (14:51 -0800)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file

bug:33039926
bug:33042690

Change-Id: If0431b77ec546c72f8cc25bb605a851572bb22a6

7 years agoMerge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
Michael Kwan [Thu, 15 Dec 2016 21:09:53 +0000 (21:09 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev

7 years agoFix exploit where can hide the fact that a location was mocked
Tom O'Neill [Thu, 15 Dec 2016 18:26:28 +0000 (10:26 -0800)]
Fix exploit where can hide the fact that a location was mocked

- Even if call setTestProviderLocation() with inconsistent providers,
should still end up with a location that is flagged as mocked

- Bug: 33091107

Change-Id: I39e038f25b975989c2e8651bfd9ec9e74073e6cd

7 years agoAdd null check to a11y interrupt.
Phil Weaver [Wed, 2 Nov 2016 22:40:42 +0000 (15:40 -0700)]
Add null check to a11y interrupt.

Also adding same robustness to interrupt that we have for
sending a11y events.

Bug: 32507871

Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit 867ad35d9c676b5ba2047b0fc9a4006737e5c4aa)

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
Julius D'souza [Wed, 14 Dec 2016 19:18:04 +0000 (19:18 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec  -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71
am: 8cc9f081aa

Change-Id: I39ecaf420d8bc4390c737fd378fd0e32202e2d8c

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
Julius D'souza [Wed, 14 Dec 2016 19:11:59 +0000 (19:11 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec  -s ours am: 7a69e8f3d8 am: af0b547fc7
am: 20081c4e71

Change-Id: I5e461a835cf64ba69894da2c5493a9d8a1ebcbcf

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
Julius D'souza [Wed, 14 Dec 2016 19:06:29 +0000 (19:06 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec  -s ours am: 7a69e8f3d8
am: af0b547fc7

Change-Id: I23ef765ebbd2dde2110946fcc46c6b61e11733f2

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
Julius D'souza [Wed, 14 Dec 2016 19:00:38 +0000 (19:00 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec  -s ours
am: 7a69e8f3d8

Change-Id: I581e1cd6ef0dec7042802b29dd76db8ffc02cec3

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController
Julius D'souza [Wed, 14 Dec 2016 18:54:02 +0000 (18:54 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController
am: e6f8cb29ec  -s ours

Change-Id: Ia7bdba0fd3d52bb2d7c33f81d376336563f3a5cb