Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Christie
655361b2b1 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 
am: 5a6b11114a

Change-Id: Ie2c2290014481772cf10c5f9e4fc565bf06e74a3
 2016-08-12 19:56:57 +00:00
Treehugger Robot
96660b37a1 Merge "recvfrom takes a non-const pointer." 2016-08-12 19:48:38 +00:00
Chih-Hung Hsieh
c76aa69207 resolve merge conflicts of 17bd236 to stage-aosp-master 
am: b3d46b44a3

Change-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62
 2016-08-12 19:30:02 +00:00
Chih-Hung Hsieh
b3d46b44a3 resolve merge conflicts of 17bd236 to stage-aosp-master 
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
 2016-08-12 11:44:16 -07:00
David Gross
b50e856fc7 Update RenderScript docs: reduction, other API 23/24 changes, cleanup. 
Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
  to Android 2.3 (API level 9).

Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.

Miscellaneous minor editorial changes.

Bug: 27299393
Bug: 30000147

Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f
(cherry picked from commit 05eef3040e)
 2016-08-12 11:06:29 -07:00
Chih-hung Hsieh
17bd236b4b Merge "Fix clang-tidy warnings in aapt and aapt2." 2016-08-12 18:05:32 +00:00
Elliott Hughes
2fa54ef232 recvfrom takes a non-const pointer. 
Change-Id: Ib2c8f2710cb333904106f849f492c83697fdd937
 2016-08-12 10:53:48 -07:00
Chih-Hung Hsieh
ef57a0d629 resolve merge conflicts of 76ce8e5 to stage-aosp-master 
am: ed935c32f4

Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
 2016-08-12 00:31:29 +00:00
Chih-Hung Hsieh
ed935c32f4 resolve merge conflicts of 76ce8e5 to stage-aosp-master 
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
 2016-08-11 16:48:46 -07:00
Treehugger Robot
76ce8e5242 Merge "Fix clang-tidy warnings in libs/hwui." 2016-08-11 23:20:47 +00:00
Jakub Pawlowski
84b61fb4b0 resolve merge conflicts of 5671277 to stage-aosp-master 
am: 5aa4ba3776

Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872
 2016-08-11 23:05:49 +00:00
Jakub Pawlowski
5aa4ba3776 resolve merge conflicts of 5671277 to stage-aosp-master 
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
 2016-08-11 15:53:06 -07:00
Jakub Pawlowski
5671277d2a Merge "Add LE Secure Connection data parsing (1/4)" 2016-08-11 22:32:23 +00:00
Chih-Hung Hsieh
8bd37ba458 Fix clang-tidy warnings in aapt and aapt2. 
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Merged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
 2016-08-11 15:20:10 -07:00
Jakub Pawlowski
747711ce9b Add LE Secure Connection data parsing (1/4) 
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
 2016-08-11 22:18:19 +00:00
Phil Weaver
157f416a35 Limit capabilities of a11y gesture dispatch. 
Changing the service side to accept descriptions of
motion events, not motion events themselves, so we can
control their creation.

Bug: 30647115
Change-Id: Ia6772a1fc05df91818e3f88959d1e2b4a35fe0cc
(cherry picked from commit a8918f23c7)
 2016-08-11 20:41:46 +00:00
David Christie
288166cbb2 resolve merge conflicts of b4a5615 to lmp-dev 
Change-Id: I1b9ebc398226ead9d7f494c4ac56a7b1d9d6586f
 2016-08-11 13:06:08 -07:00
David Christie
5a6b11114a Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev am: df7bd91dfa 
am: b9fe170c6a

Change-Id: I3e320844622617d9ae63fea4cc3a34f9f0e1e93a
 2016-08-11 18:33:18 +00:00
David Christie
b4a5615416 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 
am: 3462e52676

Change-Id: I45779f683b417fe2d3cd4f7702d07a9cd13bd6f0
 2016-08-11 18:33:15 +00:00
David Christie
b9fe170c6a Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev 
am: df7bd91dfa

Change-Id: Idec27e5beca07ace75b08de5ce0b6ee8bf1ab7f7
 2016-08-11 18:27:26 +00:00
David Christie
3462e52676 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 
am: dde12c6923

Change-Id: I772d5b997df579d3611eafc7542aeee2d690f946
 2016-08-11 18:27:22 +00:00
David Christie
df7bd91dfa Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev 2016-08-11 18:15:30 +00:00
Hans Boehm
a33407d2f8 Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340 
am: c97c9dbd96

Change-Id: I9ceb9f35c22e84a57e2c38f9e6fd562827ae7e0d
 2016-08-11 17:32:34 +00:00
Hans Boehm
c97c9dbd96 Merge "Do not stack allocate RefBase object in AaptAssets::filter" 
am: d0197ac340

Change-Id: I077f9c190025d688af17d1a840b841cbdc4e003d
 2016-08-11 17:28:07 +00:00
Hans Boehm
d0197ac340 Merge "Do not stack allocate RefBase object in AaptAssets::filter" 2016-08-11 17:18:22 +00:00
smain@google.com
93d8ffc4f3 add info about how to return default values from android.jar bug: 30757670 
am: abfa7e2c65

Change-Id: I45cdaec2d7e1b3c4bfb7b283a8ac581e2c87df95
 2016-08-11 16:42:50 +00:00
smain@google.com
abfa7e2c65 add info about how to return default values from android.jar 
bug: 30757670

Change-Id: I84e1624cbe7ae8d5e4e2886d4e8f61d621729464
 2016-08-11 16:28:01 +00:00
Hans Boehm
25dfa75ee3 Do not stack allocate RefBase object in AaptAssets::filter 
Doing so is likely to trigger log messages in the future, and will
hinder diagnosis of other problems.

Bug: 30292538
Change-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1
 2016-08-10 19:56:50 -07:00
Chih-Hung Hsieh
f35c939cd7 Fix clang-tidy warnings in libs/hwui. 
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
Test: build with WITH_TIDY=1

Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Merged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
 2016-08-10 23:26:59 +00:00
Robert Greenwalt
c259624d8f Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am: 2438a33e54 
am: bda5769701

Change-Id: I921e50e48b0c93e31fa3d172c850629312f322e6
 2016-08-10 21:29:31 +00:00
Robert Greenwalt
bda5769701 Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." 
am: 2438a33e54

Change-Id: I5e8e5048718edf82008b58964d90b3cc10115c71
 2016-08-10 21:20:39 +00:00
Robert Greenwalt
2438a33e54 Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." 2016-08-10 21:07:26 +00:00
Chris Tate
345219f068 Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am: 72933c623c am: a8e21860af am: 1d64d33ba8 -s ours 
am: 924b57b42c

Change-Id: Icb2821341904697bb348220bb18c668cdc8dfddb
 2016-08-10 18:04:07 +00:00
Christopher Tate
2ead59bd75 DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 am: aac7d0442c am: 6ea7b630c2 -s ours 
am: 5eac1c2544

Change-Id: I2e18c58c476c63535962c294c6a63716e536310b
 2016-08-10 18:04:00 +00:00
Chris Tate
924b57b42c Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am: 72933c623c am: a8e21860af 
am: 1d64d33ba8  -s ours

Change-Id: I68bc1793b55e6e2bf660ea6c41611e819b3f5e9a
 2016-08-10 17:55:56 +00:00
Christopher Tate
5eac1c2544 DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 am: aac7d0442c 
am: 6ea7b630c2  -s ours

Change-Id: Iefb7a9ad5f00b0f6e24c45fe5cf1d17cb0c97414
 2016-08-10 17:55:47 +00:00
Chris Tate
1d64d33ba8 Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am: 72933c623c 
am: a8e21860af

Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1
 2016-08-10 17:44:52 +00:00
Christopher Tate
6ea7b630c2 DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 
am: aac7d0442c

Change-Id: Ida93e1782221df18b2e7abcaa9da319e5ed28325
 2016-08-10 17:44:50 +00:00
Chris Tate
a8e21860af Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev 
am: 72933c623c

Change-Id: I2efd8b43c279c4cbd92130a08df6e3eafcb20b2c
 2016-08-10 17:28:30 +00:00
Christopher Tate
aac7d0442c DO NOT MERGE: Backport N backup/restore stability work to M 
am: d6f3a11107

Change-Id: Ibd6e1be57f129d9ea89c8a44332da830944cf2b1
 2016-08-10 17:28:28 +00:00
Chris Tate
72933c623c Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev 2016-08-10 17:15:28 +00:00
zhangshuxiao
bad369d63e [NetworkPolicy]: Fixes the crash issues caused by null pointer. 
When handleRegisterNetworkAgent in ConnectivityService,
the networkinfo of NetworkAgentInfo will be set to null.
So we need to handle the null pointer of state.networkInfo.

Change-Id: I2a278f1f1b2455057fd2ed323ff4df340c3cbca9
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
 2016-08-10 03:49:54 +00:00
Hemal Patel
cae34dc577 Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am: 5ca44906c6 
am: b6962dee09

Change-Id: Ifa4bcea1c47cfdfe00a36d8ad11c5aeaeeb71175
 2016-08-09 21:10:37 +00:00
Hemal Patel
3547fd0642 Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6 
am: dabee01e9b

Change-Id: I6e3156f2990ddfd73b34015be8a09c972729d26e
 2016-08-09 21:10:34 +00:00
Hemal Patel
57d3e1c9e1 Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am: a70c722c77 
am: 3c49a4b761

Change-Id: I81d45c0ddc35a34da756808ccfb89017b286f261
 2016-08-09 21:10:28 +00:00
Hemal Patel
fbbb95ffbf Docs: Changed custom_toast to toast_layout am: 3b7309d753 
am: ca17f5b8e3

Change-Id: Ic306fd462773e6b6b457a0f8c1ee4a5bd931be22
 2016-08-09 21:10:24 +00:00
Hemal Patel
b6962dee09 Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs 
am: 5ca44906c6

Change-Id: I4286b4a8e0766f7c3ca2d7e5ebd5c9f2b296fbb9
 2016-08-09 21:03:19 +00:00
Hemal Patel
dabee01e9b Docs: Fixed the link that loads Fragments guide 
am: a8e1c75bf6

Change-Id: I26ea32ff32067d86fb5390103eec737b293ac031
 2016-08-09 21:03:13 +00:00
Hemal Patel
3c49a4b761 Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs 
am: a70c722c77

Change-Id: I6e1d0d70d5d4b89b083cb74272f064bebf6a273a
 2016-08-09 21:03:06 +00:00
Hemal Patel
ca17f5b8e3 Docs: Changed custom_toast to toast_layout 
am: 3b7309d753

Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
 2016-08-09 21:03:00 +00:00