OSDN Git Service
Bill Yi [Fri, 30 Dec 2016 05:20:35 +0000 (21:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ied8ca4b5bbae1d9092a6df5acade12feb7d25517
Auto-generated-cl: translation import
Charles He [Thu, 29 Dec 2016 11:20:16 +0000 (11:20 +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
am:
821fdbd3ff
Change-Id: I3dab3f81346bd13b1ae343dd6e21a437b642a080
Charles He [Thu, 29 Dec 2016 11:19:07 +0000 (11:19 +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
am:
3ad5df5231
Change-Id: I9c159162e18af0820c76d42c22e2ec001ab72c62
Charles He [Thu, 29 Dec 2016 11:18:04 +0000 (11:18 +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
am:
b5f3383589
Change-Id: I85ff02b53d1285d8e8a4e7c30ae9a988c52d6468
Charles He [Thu, 29 Dec 2016 11:16:55 +0000 (11:16 +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
am:
08ea823955
Change-Id: I079501cac553468878a6642a64110f4de3e56698
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Charles He [Thu, 29 Dec 2016 09:50:20 +0000 (09:50 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
am:
71d2a41dd9
Change-Id: Iab575b1efdd720c9cf9e32e0b056c99eff98deab
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
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
Charles He [Thu, 29 Dec 2016 09:43:10 +0000 (09:43 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." 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
TreeHugger Robot [Thu, 29 Dec 2016 01:41:52 +0000 (01:41 +0000)]
Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:13:14 +0000 (00:13 +0000)]
Merge "2D recents: show all close buttons right away" into nyc-mr2-dev
Jiaquan He [Thu, 29 Dec 2016 00:12:48 +0000 (00:12 +0000)]
Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev
Jiaquan He [Tue, 27 Dec 2016 22:44:14 +0000 (14:44 -0800)]
Move grid checking into the layout algorithm.
We move grid layout checking into the layout algorithm, so that we can
hide more computation from the views.
Bug:
32101881
Change-Id: I174fe33ef7ed3c04987771dbb42d831a4b9bdab2
TreeHugger Robot [Wed, 28 Dec 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Resue TaskView information." into nyc-mr2-dev
Andrew Solovay [Wed, 28 Dec 2016 20:32:03 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I32b241e93caac5e38c54610b799c877365be75ff
Andrew Solovay [Wed, 28 Dec 2016 20:31:02 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: I9b15c8787d6f6aa6c2d362de46ab06a583d3283c
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
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
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
Jiaquan He [Wed, 28 Dec 2016 19:12:23 +0000 (19:12 +0000)]
Merge "Check split screen properly." into nyc-mr2-dev
Jorim Jaggi [Wed, 28 Dec 2016 17:01:18 +0000 (17:01 +0000)]
Merge "Change screen pinning back to old gesture" into nyc-mr2-dev
Jorim Jaggi [Wed, 14 Dec 2016 19:02:39 +0000 (11:02 -0800)]
Change screen pinning back to old gesture
This makes the code a bit more complicated, but allows apps to
receive long-press back again and also makes the mode harder
to exit for toddlers.
Test: Without TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Test: With TalkBack enabled, make sure the following works:
- Enter multi-window mode with long pressing recents
- Long press back gets sent to the app.
- Enter screen pinning, make sure you can exit with gesture
Merged-In: Icd7347aa9c60af00fdb0b3991baabb730552d097
Change-Id: Icd7347aa9c60af00fdb0b3991baabb730552d097
Fixes:
32440409
Jiaquan He [Tue, 27 Dec 2016 19:05:44 +0000 (11:05 -0800)]
Resue TaskView information.
In this commit we calculate all the TaskView information we need
during initialization, so that we don't need to calculate again
unless any configuration is changed.
Bug:
32101881
Change-Id: I433688d0a05c69064d0da5268b61340cecdbfe74
Adrian Roos [Tue, 27 Dec 2016 23:36:56 +0000 (23:36 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
Adrian Roos [Tue, 27 Dec 2016 23:20:43 +0000 (23:20 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
Jiaquan He [Fri, 23 Dec 2016 00:47:59 +0000 (16:47 -0800)]
Check split screen properly.
This commit detacts split screen by checking whether there's
a docked task instead of multi window mode.
Bug:
33847223
Bug:
32101881
Change-Id: I23ee11e57ded7c5e81d51cfbfea05500a879945c
TreeHugger Robot [Tue, 27 Dec 2016 19:08:55 +0000 (19:08 +0000)]
Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev
Selim Cinek [Tue, 27 Dec 2016 11:06:35 +0000 (11:06 +0000)]
DO NOT MERGE Revert "Add Brightness setting for VR Mode."
This reverts commit
84980c7a93e93e7134c0198212e222e11eb5ccbd.
Bug:
33895226
Bug:
30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
Adrian Roos [Tue, 27 Dec 2016 18:12:13 +0000 (10:12 -0800)]
Keyguard: Don't lock on SIM removed during shutdown
Fixes a glitch where the SIM is considered removed because
we turn off the radio during shutdown.
Change-Id: Id783114f557b87051b833ea84cecc862f910c6ca
Fixes:
33788000
Lorenzo Colitti [Fri, 23 Dec 2016 04:54:50 +0000 (13:54 +0900)]
Don't loop forever on zero-length ICMPv6 ND options.
Bug:
33828433
Change-Id: Ie1905167126c8c8f3896eaa5e36cd006ca354e99
Santos Cordon [Thu, 22 Dec 2016 23:49:16 +0000 (23:49 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
Santos Cordon [Tue, 20 Sep 2016 22:50:35 +0000 (15:50 -0700)]
Add Brightness setting for VR Mode.
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.
Bug:
30984614
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
TreeHugger Robot [Thu, 22 Dec 2016 21:03:00 +0000 (21:03 +0000)]
Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
Pankaj Kanwar [Thu, 22 Dec 2016 20:41:54 +0000 (20:41 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
Daniel Nishi [Thu, 22 Dec 2016 19:06:51 +0000 (11:06 -0800)]
Fix a bug where the package stats query timeout may crash.
This adds a null-check to verify that we got real data before
trying to use it and increases the timeout time to reduce the
likelihood of timing out.
Test: FrameworkServicesTests
Bug:
33836034
Change-Id: Ia1ad4aba05c5c4fb8688fc9fc94df344f736e396
pkanwar [Thu, 22 Dec 2016 19:12:02 +0000 (11:12 -0800)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug:
31003437
Change-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da
Tom O'Neill [Thu, 22 Dec 2016 18:09:48 +0000 (18:09 +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
am:
f035e8b411
Change-Id: I0795fffc9f7f79f14038cfb6386bbe308b879db5
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
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
Pankaj Kanwar [Thu, 22 Dec 2016 17:59:08 +0000 (17:59 +0000)]
Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 22 Dec 2016 16:57:10 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 22 Dec 2016 08:00:05 +0000 (08:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 22 Dec 2016 03:50:32 +0000 (19:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id563dc4a6227745978c8999d577b0970c5c1103f
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Dec 2016 03:41:35 +0000 (19:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I292c850e85d1d11be974bc80ddd0ecd7a66ca557
Auto-generated-cl: translation import
pkanwar [Sun, 18 Dec 2016 04:16:48 +0000 (20:16 -0800)]
DO NOT MERGE: Add API to indicate carrier networks.
Bug:
31003437
Change-Id: I3e3989256588f509c45e50374b8b7168589d6c5d
Hugo Benichi [Thu, 22 Dec 2016 00:49:11 +0000 (09:49 +0900)]
NetworkNotificationManager: remove spammy log
Test: build, flashed, booted phone.
Bug:
32198726
Change-Id: I3ac2f07c756f48653195f6198aaee4d8b3939fb5
Adrian Roos [Wed, 21 Dec 2016 19:56:38 +0000 (19:56 +0000)]
Merge "DirectReply: Close if touching outside status bar" into nyc-mr2-dev
Daniel Nishi [Wed, 21 Dec 2016 18:37:25 +0000 (18:37 +0000)]
Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev
TreeHugger Robot [Wed, 21 Dec 2016 18:09:45 +0000 (18:09 +0000)]
Merge "DO NOT MERGE - Disabled swiping in Grid-based Recents." into nyc-mr2-dev
Allen Hair [Thu, 22 Sep 2016 16:58:06 +0000 (09:58 -0700)]
Enable multi-dex for coverage builds to fix breakage
Test: m PRODUCT-bullhead-userdebug showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I6a324cbd0dc078ad2903345a069385d9f0d179ff
(cherry picked from commit
aeaee4c5fe9a71949ddd701f2590559819bfe072)
TreeHugger Robot [Wed, 21 Dec 2016 03:35:41 +0000 (03:35 +0000)]
Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev
Manu Cornet [Wed, 21 Dec 2016 03:01:41 +0000 (19:01 -0800)]
2D Recents: use a slightly darker scrim background
Bug:
32101881
Test: Checked recents layout on local sw600dp device
Change-Id: Ic5ae1c1c805896a4cd8d6c3473fa2c693e94d304
TreeHugger Robot [Wed, 21 Dec 2016 02:14:51 +0000 (02:14 +0000)]
Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev
* changes:
Augment diskstats dumpsys to have categorization and apps.
Add a file collector to the platform.
TreeHugger Robot [Wed, 21 Dec 2016 02:14:51 +0000 (02:14 +0000)]
Merge "Add an app size collector." into nyc-mr2-dev
Jiaquan He [Mon, 19 Dec 2016 19:20:31 +0000 (11:20 -0800)]
DO NOT MERGE - Disabled swiping in Grid-based Recents.
Bug:
32101881
Change-Id: I45a806a6b1fc387b2c560a8f2228ad83e4068d7c
(cherry picked from commit
7e09146f1330c3ebe774f29f49d94bf290a1be7f)
OSDN Git Service
