OSDN Git Service
Julia Reynolds [Fri, 15 Jul 2016 14:34:14 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I10e3412be1a534f5511f72da63ea7581cab21140
Julia Reynolds [Fri, 15 Jul 2016 14:27:24 +0000 (14:27 +0000)]
Merge \\\\"Check caller\\\\'s uid before allowing notification policy access.\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89
am:
e1d8b98189 -s ours
Change-Id: I583fa066aaf12cacb841b10f751ad0ad7a1de237
Julia Reynolds [Fri, 15 Jul 2016 14:17:56 +0000 (14:17 +0000)]
Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c
am:
5c6db3af89
Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519
Julia Reynolds [Fri, 15 Jul 2016 14:12:23 +0000 (14:12 +0000)]
Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am:
234e1c25e4
am:
8e8bb6633c
Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3
Julia Reynolds [Fri, 15 Jul 2016 14:06:49 +0000 (14:06 +0000)]
Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
am:
234e1c25e4
Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa
Julia Reynolds [Fri, 15 Jul 2016 13:59:04 +0000 (13:59 +0000)]
Merge "Check caller's uid before allowing notification policy access." into mnc-dev
Victor Chang [Thu, 14 Jul 2016 22:10:06 +0000 (22:10 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-dev
am:
488042fe3b
Change-Id: Ia41b8b2acbe3897423ac27881f3419efcfeeb002
Victor Chang [Thu, 14 Jul 2016 22:04:10 +0000 (22:04 +0000)]
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-dev
Bill Yi [Thu, 14 Jul 2016 20:46:02 +0000 (20:46 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
9cdfb9d781 -s ours
Change-Id: Ib5e9579d28d84fa2fa26910fb6857b06b2d09560
TreeHugger Robot [Thu, 14 Jul 2016 20:39:48 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Sergio Giro [Thu, 14 Jul 2016 18:48:57 +0000 (18:48 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226 am:
ff58d7c918 -s ours
am:
437776ac65
Change-Id: I5cfc049e64fd76fc865dcaf04590e3f665dc91f4
Sergio Giro [Thu, 14 Jul 2016 18:42:45 +0000 (18:42 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b am:
bab3334226
am:
ff58d7c918 -s ours
Change-Id: I31000817d4f99c215277d580948a20194176d53e
Sergio Giro [Thu, 14 Jul 2016 18:23:54 +0000 (18:23 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2 am:
008120497b
am:
bab3334226
Change-Id: I6e4e399dfcf89f46d40a162c77462b889883f569
Felipe Leme [Thu, 14 Jul 2016 18:23:34 +0000 (18:23 +0000)]
Merge \"Fixed statuses on Battery Saver column.\" into nyc-dev
am:
24b2e7bbee
Change-Id: I7920617a1506817b25ade8e92bfb1945d2f173bb
Sergio Giro [Thu, 14 Jul 2016 18:15:33 +0000 (18:15 +0000)]
Add bound checks to utf16_to_utf8 am:
bce11021b2
am:
008120497b
Change-Id: Ib3135f8f186b10b773592d2bcbeae398cfd2fee1
smain@google.com [Thu, 14 Jul 2016 18:14:02 +0000 (18:14 +0000)]
delete old Community page, redirect to Support page
am:
845cf07bdd
Change-Id: I9df159290cf9818dd566754cea0e880afdb1633d
Felipe Leme [Thu, 14 Jul 2016 18:10:55 +0000 (18:10 +0000)]
Merge "Fixed statuses on Battery Saver column." into nyc-dev
Sergio Giro [Thu, 14 Jul 2016 18:07:33 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
1deedbacc3
Change-Id: I05847ae2c26a266b3c05324230062757e6978fd2
Sergio Giro [Thu, 14 Jul 2016 18:07:23 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
bce11021b2
Change-Id: Ic4995dee3763290f75b3ef623f257c71748d9d51
smain@google.com [Thu, 14 Jul 2016 18:05:19 +0000 (11:05 -0700)]
delete old Community page, redirect to Support page
Change-Id: I2c570f8bf88392db75aa78c2e702515b262f2830
Felipe Leme [Thu, 14 Jul 2016 18:04:49 +0000 (11:04 -0700)]
Fixed statuses on Battery Saver column.
BUG:
30139400
Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Bill Yi [Thu, 14 Jul 2016 13:33:13 +0000 (06:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I00c813fd0ad16c98cc15eec52a9af333528babfa
Auto-generated-cl: translation import
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Victor Chang [Tue, 12 Jul 2016 22:47:29 +0000 (23:47 +0100)]
Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set
Fix:
29899712
Change-Id: I38cc9d0e584c3f2674c9ff1d91f77a11479d8943
(cherry picked from commit
9c7b706cf4332b4aeea39c166abca04b56685280)
Andrew Solovay [Thu, 14 Jul 2016 02:03:59 +0000 (02:03 +0000)]
Merge \"docs: Added link to API diff between M and N\" into nyc-dev
am:
17b221792a
Change-Id: I435a52f4bbf224a1f64ca2c34ea17c1e6ac779d0
Andrew Solovay [Thu, 14 Jul 2016 01:52:18 +0000 (01:52 +0000)]
Merge "docs: Added link to API diff between M and N" into nyc-dev
Adam Lesinski [Thu, 14 Jul 2016 01:50:52 +0000 (01:50 +0000)]
Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am:
f8e99e72e7
Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db
Adam Lesinski [Thu, 14 Jul 2016 01:40:34 +0000 (01:40 +0000)]
Merge "Don't hold on to AssetManager instances" into nyc-dev
Wei Jia [Thu, 14 Jul 2016 01:14:42 +0000 (01:14 +0000)]
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev
am:
9604b3803c
Change-Id: Ibbb2272be91fb6c79795566cb9928bfb8adde002
TreeHugger Robot [Thu, 14 Jul 2016 01:07:13 +0000 (01:07 +0000)]
Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-dev
Adam Lesinski [Wed, 13 Jul 2016 19:09:24 +0000 (12:09 -0700)]
Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.
crbug.com/627586
Bug:
30118654
Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
Tim Murray [Thu, 14 Jul 2016 00:07:49 +0000 (00:07 +0000)]
Merge \"Don\'t dump stack traces for background ANRs.\" into nyc-dev
am:
b2b203ae13
Change-Id: Iea2c941636c829b687470244cff22a03ea51d9f7
Tim Murray [Thu, 14 Jul 2016 00:00:29 +0000 (00:00 +0000)]
Merge "Don't dump stack traces for background ANRs." into nyc-dev
Wei Jia [Thu, 7 Jul 2016 23:08:30 +0000 (16:08 -0700)]
MediaDataSource: add DrmInitialization for IDataSource.
Bug:
29342399
Bug:
28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
(cherry picked from commit
a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
David Friedman [Wed, 13 Jul 2016 23:15:39 +0000 (23:15 +0000)]
Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev
am:
419dbdb538
Change-Id: I619eefcc177dfd980ed5005e9df7a428b75f0418
Chris Craik [Wed, 13 Jul 2016 23:15:35 +0000 (23:15 +0000)]
Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev
am:
807989facd
Change-Id: I09c2114b0ff2aa1badb414da9b3b5cd2bbd63669
Tim Murray [Wed, 13 Jul 2016 20:33:28 +0000 (13:33 -0700)]
Don't dump stack traces for background ANRs.
Dumping stack traces can be extremely expensive, and doing so for
background applications often has extremely negative side effects for
foreground applications. This can be exacerbated by resource-intensive
applications, because those may exhibit thermal throttling in the first
place. For such applications, the additional performance hit caused by
stack dumps may be catastrophic.
Instead, don't dump stack traces for background ANRs except for the app
that actually ANR'd.
bug
30112521
Change-Id: I8a05059343254861c436a193690cd1c50a95d674
Joe Fernandez [Wed, 13 Jul 2016 23:00:26 +0000 (23:00 +0000)]
Merge "Doc: Minor fixes following launch of Performance section on DAC." into nyc-dev
Chris Craik [Wed, 13 Jul 2016 22:49:19 +0000 (22:49 +0000)]
Merge "Avoid throwing when 0 size layer requested" into nyc-dev
Cheryl Potter [Wed, 13 Jul 2016 22:44:28 +0000 (22:44 +0000)]
Merge \"docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484\" into nyc-dev
am:
e820803172
Change-Id: Ib3f7b1971925f8cfd2cf29bf156021bfe43ff264
Andrew Solovay [Wed, 13 Jul 2016 22:17:10 +0000 (15:17 -0700)]
docs: Added link to API diff between M and N
Removed links to download the reference docs bundle, now that the
API docs and the diff are available online.
See first comment for doc stage location.
bug:
29245751
Change-Id: I65f8661463cb03b6651391771abd2597d6e59a44
Cheryl Potter [Wed, 13 Jul 2016 22:13:49 +0000 (22:13 +0000)]
Merge "docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484" into nyc-dev
Dmitriy Filchenko [Wed, 13 Jul 2016 20:02:33 +0000 (20:02 +0000)]
Merge \\"Remove calls to set_process_name.\\" am:
8ee58b3b4e
am:
c1a1487057
Change-Id: I3319e3f159c13a5135d6986d7e4a29a1ac88a18b
Dmitriy Filchenko [Wed, 13 Jul 2016 19:57:52 +0000 (19:57 +0000)]
Merge \"Remove calls to set_process_name.\"
am:
8ee58b3b4e
Change-Id: Ia0157f7b7fa1b048ca98b55f5525089046e6cccd
Treehugger Robot [Wed, 13 Jul 2016 19:50:52 +0000 (19:50 +0000)]
Merge "Remove calls to set_process_name."
Kevin Hufnagle [Wed, 13 Jul 2016 18:06:49 +0000 (18:06 +0000)]
Merge \"docs: Added \"developer stories\" articles.\" into nyc-dev
am:
686996d2dc
Change-Id: Ib6470cf466c655d97000b23bd5f7e6f485152d02
Kevin Hufnagle [Wed, 13 Jul 2016 17:52:24 +0000 (17:52 +0000)]
Merge "docs: Added "developer stories" articles." into nyc-dev
Cheryl Potter [Wed, 13 Jul 2016 01:02:18 +0000 (18:02 -0700)]
docs: added placeholder redirect for New Class dialog AS 2.2
b/
30045484
Change-Id: I22fe7f3d7af654f12876412dff43d81fc31f305c
Joe Fernandez [Wed, 13 Jul 2016 00:44:36 +0000 (00:44 +0000)]
Merge \"docs: fix redirects for shareables\" into nyc-dev
am:
e181729b18
Change-Id: Ifc0ca35213e38efa516e070b1bf42fb29536d338
Joe Fernandez [Wed, 13 Jul 2016 00:37:11 +0000 (00:37 +0000)]
Merge "docs: fix redirects for shareables" into nyc-dev
Joe Fernandez [Wed, 13 Jul 2016 00:13:55 +0000 (17:13 -0700)]
docs: fix redirects for shareables
b/
30037099
Change-Id: I201b428d156a7f3eb49d92c6f5539b8f2c1998bb
Vladislav Kaznacheev [Wed, 13 Jul 2016 00:08:52 +0000 (00:08 +0000)]
Fix docs for View.DRAG_FLAG_GLOBAL
am:
9a44eaec53
Change-Id: I4b0548a4fb7bff0312d2cd73217f64f361216c50
Dmitriy Filchenko [Tue, 12 Jul 2016 22:40:54 +0000 (15:40 -0700)]
Remove calls to set_process_name.
BUG:
29824203
Change-Id: I67a1eb350cf9ea28c554166986df8fc251b666eb
Vladislav Kaznacheev [Tue, 12 Jul 2016 22:24:48 +0000 (15:24 -0700)]
Fix docs for View.DRAG_FLAG_GLOBAL
Document that cross-app drags only involve apps compiled for API 24 or later.
Bug:
30076806
Change-Id: Ia630f4623c23d787b52692ff1f6475408cefa177
Sudheer Shanka [Tue, 12 Jul 2016 19:59:12 +0000 (19:59 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3 am:
a730e5977e am:
cbe258aa27 -s ours
am:
5b28589127
Change-Id: Id67b945304514fb291021ad30835ecb8f04e0cfb
Sudheer Shanka [Tue, 12 Jul 2016 19:59:08 +0000 (19:59 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88 am:
1bb51deaf4 -s ours
am:
5441a248f4
Change-Id: I2441f27ef71cd55f302821f429995414c997c222
Sudheer Shanka [Tue, 12 Jul 2016 19:52:48 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3 am:
a730e5977e
am:
cbe258aa27 -s ours
Change-Id: I1cd45ce38ea1859fef073124cd3362076b2c33e4
Sudheer Shanka [Tue, 12 Jul 2016 19:52:44 +0000 (19:52 +0000)]
Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c am:
e8458d8f88
am:
1bb51deaf4 -s ours
Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61
Sudheer Shanka [Tue, 12 Jul 2016 19:47:49 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b am:
322e70cef3
am:
a730e5977e
Change-Id: Ic3f93423fed99fe6e1b1142e9f949866897954ae
Sudheer Shanka [Tue, 12 Jul 2016 19:47:44 +0000 (19:47 +0000)]
Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48 am:
008d66e49c
am:
e8458d8f88
Change-Id: If984b3437bc60d99e693907aef24f3b7b1218836
Sudheer Shanka [Tue, 12 Jul 2016 19:42:40 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours am:
6ae7a5f72b
am:
322e70cef3
Change-Id: I8c18ad1a029c13f1be022e12031f29d3cbba2220
Sudheer Shanka [Tue, 12 Jul 2016 19:42:38 +0000 (19:42 +0000)]
Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours am:
7975dd5b48
am:
008d66e49c
Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca
Sudheer Shanka [Tue, 12 Jul 2016 19:34:39 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9 am:
76c9d70756 -s ours
am:
6ae7a5f72b
Change-Id: I89dd8c81075ebc85173c5fc37e8a4d1dfe312bbb
Sudheer Shanka [Tue, 12 Jul 2016 19:34:38 +0000 (19:34 +0000)]
Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e am:
fd0757f195 -s ours
am:
7975dd5b48
Change-Id: I343863180866b38af4f91a6f79068c21096e7ce0
Sudheer Shanka [Tue, 12 Jul 2016 19:27:39 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am:
d327d73edf am:
cb7e0643c9
am:
76c9d70756 -s ours
Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68
Sudheer Shanka [Tue, 12 Jul 2016 19:27:37 +0000 (19:27 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-mr1-dev am:
f1d9152f9f am:
177422c91e
am:
fd0757f195 -s ours
Change-Id: I17b97d1cfefa769b07ea798c6f87f8af22a31329
Sudheer Shanka [Tue, 12 Jul 2016 19:20:38 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am:
d327d73edf
am:
cb7e0643c9
Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42
Sudheer Shanka [Tue, 12 Jul 2016 19:20:34 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am:
f1d9152f9f
am:
177422c91e
Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
Sudheer Shanka [Tue, 12 Jul 2016 19:11:37 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
am:
d327d73edf
Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1
Sudheer Shanka [Tue, 12 Jul 2016 19:11:35 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
am:
f1d9152f9f
Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
Sudheer Shanka [Tue, 12 Jul 2016 19:03:18 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:12 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev
Kevin Hufnagle [Tue, 12 Jul 2016 17:54:18 +0000 (17:54 +0000)]
Merge \"docs: Removed self-referencing links on Apps and Games pages.\" into nyc-dev
am:
4c8d924d4c
Change-Id: I8d8fca3aae027c6130590fae763fdba2a9f207b1
Kevin Hufnagle [Tue, 12 Jul 2016 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Removed self-referencing links on Apps and Games pages." into nyc-dev
Amith Yamasani [Tue, 12 Jul 2016 17:47:05 +0000 (17:47 +0000)]
Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am:
e278cf7665
Change-Id: Idd28d2ca2f46e8745392b5194dd2c8c370213ff7
Amith Yamasani [Tue, 12 Jul 2016 17:40:12 +0000 (17:40 +0000)]
Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev
Kevin Hufnagle [Thu, 30 Jun 2016 00:14:27 +0000 (17:14 -0700)]
docs: Added "developer stories" articles.
Developer stories include Aftenposten, El Mundo, Segundamano,
Tapps, and Upbeat Games.
Bug:
29240693
Change-Id: I9159aadbab403dc86bcdb400a6cd99ba76af831c
Bill Yi [Tue, 12 Jul 2016 16:27:20 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
a2e1bb8c3e -s ours
Change-Id: I9cc0d048ec0185cdb7e4a69f6d75640fc22390ab
Bill Yi [Tue, 12 Jul 2016 16:27:16 +0000 (16:27 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
84c67fa304 -s ours
Change-Id: Iab40dd880d5a6c97614b4958747e4e7d2010c6ed
Joe Fernandez [Tue, 12 Jul 2016 16:27:12 +0000 (16:27 +0000)]
Merge \"docs: July 2016 Dashboard update\" into nyc-dev
am:
ba64d0ec2e
Change-Id: I23be5d435997ae2097dd7978f8a151b2d6074f97
TreeHugger Robot [Tue, 12 Jul 2016 16:11:59 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:11 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Joe Fernandez [Tue, 12 Jul 2016 16:09:53 +0000 (16:09 +0000)]
Merge "docs: July 2016 Dashboard update" into nyc-dev
Gopinath [Tue, 12 Jul 2016 16:09:18 +0000 (16:09 +0000)]
Merge \"App launch - Test app changes\" into nyc-dev
am:
8fabbb89c0
Change-Id: I304e8791b2ea72bd527fa0c8abd2c748c90e866c
Joe Fernandez [Tue, 12 Jul 2016 16:06:29 +0000 (09:06 -0700)]
docs: July 2016 Dashboard update
Change-Id: Ia2c6488340e7d17696ffe67ba120cb30bea94717
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge "App launch - Test app changes" into nyc-dev
Hugo Benichi [Tue, 12 Jul 2016 13:20:56 +0000 (13:20 +0000)]
Merge \\"Fix unsafe concurrent access in LegacyTypeTracker\\" am:
ee4c8fb9eb
am:
e82b43f77e
Change-Id: I20a3426002ebe6f4db9de7edf7c4072d0a27dbdc
Hugo Benichi [Tue, 12 Jul 2016 13:15:41 +0000 (13:15 +0000)]
Merge \"Fix unsafe concurrent access in LegacyTypeTracker\"
am:
ee4c8fb9eb
Change-Id: I928b2c6ef8e20e197425c214242287185a9daa06
Treehugger Robot [Tue, 12 Jul 2016 13:08:20 +0000 (13:08 +0000)]
Merge "Fix unsafe concurrent access in LegacyTypeTracker"
Hugo Benichi [Tue, 21 Jun 2016 00:48:07 +0000 (09:48 +0900)]
Fix unsafe concurrent access in LegacyTypeTracker
This patch adds synchronization inside LegacyTypeTracker so that
getNetworkForType() can safely run concurrently with remove().
Without synchronization if remove() removes the last network for a
given type while getNetworkForType() runs for the same type, it is
possible that getNetworkForType tries to access the head of an empty
list, resulting in a runtime exception.
This issue was found by zoran.jovanovic@sonymobile.com who proposed a
fix in AOSP (Change-Id: Ia963662edb9d643790e8d9439e4dbdcac4c2187b).
This patch differs from the fix proposed by the bug reporter and tries
instead to do the minimum amount of locking to make getNetworkForType
safe.
Bug:
29030387
(cherry picked from commit
78caa25870391f676e1edbd448b5ff3e12a99a1e)
Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d
Bill Yi [Tue, 12 Jul 2016 06:21:45 +0000 (23:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I336a5cd0babcb768a62375cb8d63afa7a7d9532c
Auto-generated-cl: translation import
Bill Yi [Tue, 12 Jul 2016 06:04:28 +0000 (23:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I59f3cb6bc56b5bb55e32ea870b875ab30c8bd28d
Auto-generated-cl: translation import
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
DO NOT MERGE: Reduce shell power over user management.
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.
Bug:
29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Bert McMeen [Tue, 12 Jul 2016 00:56:36 +0000 (00:56 +0000)]
Merge \\\"Docs: Release Notes for Dev Preview 2\\\" into mnc-io-docs am:
b039c753f3 am:
40df51ce20
am:
3ed7666f03
Change-Id: I63cb2c22bc88bdbe657ccde673435a32cbe2e895
Bert McMeen [Tue, 12 Jul 2016 00:50:19 +0000 (00:50 +0000)]
Merge \\"Docs: Release Notes for Dev Preview 2\\" into mnc-io-docs am:
b039c753f3
am:
40df51ce20
Change-Id: I2d698e096a81093a8471dcd3dcf1994986c29a97
Bert McMeen [Tue, 12 Jul 2016 00:45:11 +0000 (00:45 +0000)]
Merge \"Docs: Release Notes for Dev Preview 2\" into mnc-io-docs
am:
b039c753f3
Change-Id: I39f6735f53186f6cb03036a3c7731ca06449acf1
Bert McMeen [Tue, 12 Jul 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Docs: Release Notes for Dev Preview 2" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:29:22 +0000 (00:29 +0000)]
Merge \\\"Docs: Information on OTA updates\\\" into mnc-io-docs am:
2f297621a1 am:
1dee5f4dbe
am:
d8c8d710b7
Change-Id: I6087417af1d91756b44028ef8529cfacbe606869
OSDN Git Service
