Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,692 Commits 3 Branches 0 Tags
f950ec9b1adeea9eea2fa323164030cdae07ee26
Commit Graph

206692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
f950ec9b1a Merge "Fix missing permission check when saving pattern/password" into mnc-dev am: 45c77d951a am: 9bf8474c27 
am: 89e3f2ba98

* commit '89e3f2ba98ea6d69b1846e996c4c279a9b20c4e9':
  Fix missing permission check when saving pattern/password

Change-Id: Ice157c9ee86cf29380766d3ec266cb57594a5868
 2016-05-24 22:20:09 +00:00
Jim Miller
89e3f2ba98 Merge "Fix missing permission check when saving pattern/password" into mnc-dev am: 45c77d951a 
am: 9bf8474c27

* commit '9bf8474c27642f48aa27e2edf1bdd83b27d692c1':
  Fix missing permission check when saving pattern/password

Change-Id: I4238a43dc30be54375b6db129b360cc7d0a90b0e
 2016-05-24 22:14:24 +00:00
Jim Miller
9bf8474c27 Merge "Fix missing permission check when saving pattern/password" into mnc-dev 
am: 45c77d951a

* commit '45c77d951ab5203b8e19c2ed2ce3a0816e42b118':
  Fix missing permission check when saving pattern/password

Change-Id: I81947e95d5365bbf6a4927435f43c73dc4ac2bb0
 2016-05-24 22:08:16 +00:00
Jim Miller
45c77d951a Merge "Fix missing permission check when saving pattern/password" into mnc-dev 2016-05-24 22:04:37 +00:00
John Reck
7298186769 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 am: 0f59d9b80c 
am: 08a4808197

* commit '08a480819763dd632fd8006a0ea57b8220ee121a':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia434422652e624aa5afc871857e7d8dac168912e
 2016-05-19 22:54:05 +00:00
John Reck
08a4808197 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours am: a7895725f8 
am: 0f59d9b80c

* commit '0f59d9b80c9f5daa321b683525ba8732add007c2':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ieab233f8cc5b9a0c3468c551b4cd023532c5eff6
 2016-05-19 22:50:55 +00:00
John Reck
0f59d9b80c DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours 
am: a7895725f8

* commit 'a7895725f8858465a404cbe4f6d5091e39423529':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Icc562bb47467e7d2d352b6c03498a471ec464e63
 2016-05-19 22:47:05 +00:00
John Reck
a7895725f8 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 
am: 8238207ce6  -s ours

* commit '8238207ce6268422bcdb50d44f03e6a220081294':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58
 2016-05-19 22:43:14 +00:00
John Reck
8238207ce6 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d 
am: 1da8c9baa2

* commit '1da8c9baa2d2da49e14224d34995337c4709b1ad':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381
 2016-05-19 22:37:04 +00:00
John Reck
1da8c9baa2 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours 
am: 1fae3b370d

* commit '1fae3b370dfd9536da166ef561df630cdff02b83':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3
 2016-05-19 22:32:47 +00:00
John Reck
1fae3b370d DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours 
am: bfa719f448  -s ours

* commit 'bfa719f448ab4d90368a3cdc556e515253528e17':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed
 2016-05-19 22:28:23 +00:00
John Reck
bfa719f448 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 
am: 5527fd1323  -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd
 2016-05-19 22:21:46 +00:00
John Reck
5527fd1323 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
 2016-05-19 22:16:42 +00:00
John Reck
1b1fcbaab5 DO NOT MERGE Cherry pick libpng usage fixes 
am: 7c9f2b8aa2

* commit '7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a
 2016-05-19 19:26:24 +00:00
Chenjie Luo
58642e6545 Add null pointer check in removeConnection 
am: e370b538eb

* commit 'e370b538ebb6ca1072f270aee3003faaa0d1deb2':
  Add null pointer check in removeConnection

Change-Id: I7b615a8f7c7a89617c4f748ad74007ec73db6784
 2016-05-18 20:29:17 +00:00
John Reck
7c9f2b8aa2 DO NOT MERGE Cherry pick libpng usage fixes 
------------------------------------------

This is a combination of 2 commits.
The first commit's message is:

Forward compatibility fixes

Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8

-------------------------------------------

This is the 2nd commit message:

libpng usage tweaks

 Bug: 10447005

 Call png_set_interlace_handling explicitly instead of relying on
 implicit handling that logs warnings

 Include filename when printing warnings

Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99

-------------------------------------------
BUG:23265085
 2016-05-17 20:29:52 +00:00
Chenjie Luo
e370b538eb Add null pointer check in removeConnection 
Bug: 28607777
Change-Id: I199ed75740796540d243ad9f507ab2511c9ed3c1
 2016-05-12 17:00:27 -07:00
Adam Powell
e7e49b48b2 Backport ChooserTarget package source check from N am: 82b9565bd1 am: 6d5f80d13b 
am: 7ac638702d

* commit '7ac638702de3b8af0a02db764adb95f2d10d1524':
  Backport ChooserTarget package source check from N

Change-Id: I9d936089af04cc32a54245d91c17a23569c5fd1c
 2016-05-02 21:26:29 +00:00
Adam Powell
7ac638702d Backport ChooserTarget package source check from N am: 82b9565bd1 
am: 6d5f80d13b

* commit '6d5f80d13b06d439db08fcd5d25490edb322f923':
  Backport ChooserTarget package source check from N

Change-Id: Iec7902498e2cfe53ce16dc9faf2d91340f416799
 2016-05-02 21:21:11 +00:00
Adam Powell
6d5f80d13b Backport ChooserTarget package source check from N 
am: 82b9565bd1

* commit '82b9565bd13e2c5dac20b3221b7be28c5afe57ea':
  Backport ChooserTarget package source check from N

Change-Id: Ic7e4a8e80829ccb0b2f60c572eea15d18d6658ec
 2016-05-02 21:15:05 +00:00
Adam Powell
82b9565bd1 Backport ChooserTarget package source check from N 
Fix a bug where a ChooserTargetService could supply a ChooserTarget
pointing at a non-exported activity outside of its own package and
have it launch.

Bug 28384423

Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008
 2016-04-29 15:38:13 +00:00
Jim Miller
b5383455b6 Fix missing permission check when saving pattern/password 
Fixes bug 28163930

Change-Id: Ic98ef20933b352159b88fdef331e83e9ef6e1f20
 2016-04-20 16:54:18 -07:00
Christopher Tate
b965ced011 resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 
am: 343600c

* commit '343600c3ecff31826e50d40821927e446adb9b0a':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
 2016-04-20 21:48:43 +00:00
Christopher Tate
343600c3ec resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 
am: 8c635e7

* commit '8c635e73c698302ce6661f227c274164972f048e':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: Iae6fe5af0a8e0f27e8b45a56aecc2d722d7c3bc3
 2016-04-20 21:43:17 +00:00
Christopher Tate
8c635e73c6 resolve merge conflicts of 44e07e0 to mnc-dev 
am: 825b713

* commit '825b7134699fbaaa16423c52b7b424d4a9afefb1':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2
 2016-04-20 21:35:50 +00:00
Christopher Tate
825b713469 resolve merge conflicts of 44e07e0 to mnc-dev 
Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47
 2016-04-20 13:33:41 -07:00
Mitchell Wills
2dbac6cee5 Update scan and last network info in the WorkThread am: cf0875a 
am: c441faa

* commit 'c441faa6de5618e9da029858ce83b3e129be2974':
  Update scan and last network info in the WorkThread

Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba
 2016-04-20 18:57:29 +00:00
Mitchell Wills
c441faa6de Update scan and last network info in the WorkThread 
am: cf0875a

* commit 'cf0875a9b69da9da5e16563eca33609e775d9195':
  Update scan and last network info in the WorkThread

Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
 2016-04-20 18:53:58 +00:00
Christopher Tate
44e07e07a1 resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev 
Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71
 2016-04-20 11:37:20 -07:00
Mitchell Wills
cf0875a9b6 Update scan and last network info in the WorkThread 
This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.

Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes: 27944510
 2016-04-20 10:34:24 -07:00
Christopher Tate
5e380f096c resolve merge conflicts of 7641889 to lmp-mr1-dev 
am: cebcde3b5a

* commit 'cebcde3b5a1e406d953629d5b4c87347921a17de':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a
 2016-04-20 00:05:54 +00:00
Christopher Tate
cebcde3b5a resolve merge conflicts of 7641889 to lmp-mr1-dev 
Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020
 2016-04-19 15:51:37 -07:00
Christopher Tate
76418899e6 Kill the real/isolated uid group, not the ApplicationInfo uid 
This is a direct reimplementation in L of fixes applied to N in
these two commits:

8dc8d37c1d
e8741d23d2

Bug 19285814

Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa
 2016-04-18 15:20:01 -07:00
Michael Wright
bc57aaed0e Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd 
am: a8064c2

* commit 'a8064c2a8b54881bceade03a9d2f6c1223e055f3':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I4e8d2bff82a3308c5966a0b0c154209b727db669
 2016-04-18 18:57:54 +00:00
Michael Wright
a8064c2a8b Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e 
am: c6629bd

* commit 'c6629bd5dff622a26683269f9201b8d7871c6ef1':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I0d602765de707548ede0b1c0a6a38790626e7da1
 2016-04-18 18:52:13 +00:00
Michael Wright
c6629bd5df Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev 
am: 224582e

* commit '224582e0403bb123da49d80af21f108900185769':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I24f2bf328c91bbc05f1b76ed464d962c71e92245
 2016-04-18 18:46:44 +00:00
Michael Wright
224582e040 Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev 2016-04-18 18:40:19 +00:00
Todd Kennedy
70b32c1609 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed am: be58fe0 am: e265f35 -s ours am: 3bdb89b am: b757575 
am: d359c8a

* commit 'd359c8a26d389938d972e1febdd275c6e19f6ab7':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ibcaf0d28db2f332885b4ec9f8ee782e579f1b2b3
 2016-04-11 22:49:30 +00:00
Todd Kennedy
d359c8a26d DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed am: be58fe0 am: e265f35 -s ours am: 3bdb89b 
am: b757575

* commit 'b7575756c45c28ebc116165e4e51d7ccaea40f47':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Iee51ca7b69c8b7f45083b4dc1f657b8773f65595
 2016-04-11 22:44:03 +00:00
Todd Kennedy
b7575756c4 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed am: be58fe0 am: e265f35 -s ours 
am: 3bdb89b

* commit '3bdb89bd1c6fa2656061efd095cb794619d0ab06':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Id1a5e903e838b9118cc4bbd37879b5e840f8b3b6
 2016-04-11 22:37:51 +00:00
Todd Kennedy
3bdb89bd1c DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed am: be58fe0 
am: e265f35  -s ours

* commit 'e265f35caa276035535f7546f01a91b4e072de0c':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ide1b16d642573c37bced4d293d91bf043bb0a78d
 2016-04-11 22:32:47 +00:00
Todd Kennedy
f4753cd263 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours am: d73c865 am: e0481f0 
am: e5116c2

* commit 'e5116c291039dbdfc028a212b02518d0c49b417b':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I7a48dd50d17e12343a6c79ba33739f727f29aae2
 2016-04-11 22:32:43 +00:00
Todd Kennedy
e265f35caa DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed 
am: be58fe0

* commit 'be58fe035e8a852c903c3c1c397eaa980670d8f9':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I7cd88d627c03199ee8252862c73f88d0b6507dd9
 2016-04-11 22:27:50 +00:00
Todd Kennedy
e5116c2910 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours am: d73c865 
am: e0481f0

* commit 'e0481f0ee6321bd049ead42964dc7b4ecaf98754':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I8e1c54619278c261d952d6ed297a6a0f74b2724c
 2016-04-11 22:27:46 +00:00
Todd Kennedy
be58fe035e DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours 
am: 620a4ed

* commit '620a4ed031d807c6945d531d1a98374eba369449':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I33b683fabecb18a08e10bfd68b9c3ec6abe35f0f
 2016-04-11 22:22:35 +00:00
Todd Kennedy
e0481f0ee6 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours 
am: d73c865

* commit 'd73c865385e2177055962d1015530c48556fd9f8':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ied6935ae9e523f7f824b45ab3057cab1717296d6
 2016-04-11 22:22:30 +00:00
Todd Kennedy
620a4ed031 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours 
am: c2cc804  -s ours

* commit 'c2cc804407212d3431419cded89de1fd6269eaa2':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I60eb783f06f0eb0c09c21ea6ec0fc10340ff63c6
 2016-04-11 22:17:20 +00:00
Todd Kennedy
d73c865385 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 
am: a73fa08  -s ours

* commit 'a73fa08457827b17a3db15ccaf52cb65a693d5db':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ie5c2a26cf1c6cc8f363845fb1be187fffc1a88fe
 2016-04-11 22:17:19 +00:00
Todd Kennedy
c2cc804407 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 
am: ca13384  -s ours

* commit 'ca133845ef815d7cc1f036b1355130a8a867a98c':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I88811d2bce66e53998360909612003873e9407af
 2016-04-11 22:12:19 +00:00
Todd Kennedy
a73fa08457 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c 
am: 6e0aff3

* commit '6e0aff30cfe571c117a8f20b15c3b27f3aecc7fa':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Icc23a9c2a4dafad3ecbf91e27647318c33b39d6a
 2016-04-11 22:12:09 +00:00