drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
217,585 Commits 1 Branch 0 Tags
Commit Graph

217585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
d0709c3a32 Import translations. DO NOT MERGE 
am: bddde9b83d  -s ours

* commit 'bddde9b83db2bab9343cbe107d3672fea5314d4b':
  Import translations. DO NOT MERGE
 2015-11-20 01:15:04 +00:00
Geoff Mendal
bddde9b83d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
 2015-11-20 01:07:33 +00:00
Deepanshu Gupta
c29ac69d80 Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev 
am: 35f7562495

* commit '35f75624958bc061764c7cc71843ca7ea60c0666':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
 2015-11-19 21:00:28 +00:00
Deepanshu Gupta
77c2432574 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev 
am: 8c971ae5a0

* commit '8c971ae5a0d294175481426d4543e23dc8d4a349':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
 2015-11-19 20:58:56 +00:00
Deepanshu Gupta
35f7562495 Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev 2015-11-19 20:49:55 +00:00
Deepanshu Gupta
66098964e2 Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" 
This reverts commit 65a834980cdbb9407a3f27e48cd0a8c472182cd6.


The original revert was only for cherry-pick to release
branch.

Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
 2015-11-19 20:49:35 +00:00
Deepanshu Gupta
8c971ae5a0 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev 2015-11-19 20:48:52 +00:00
Deepanshu Gupta
65a834980c Revert "Update StaticLayout_Delegate to use new nLoadHyphenator" 
This reverts commit 631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.

The revert is only for cherry-pick back to mnc-sdk-release.

Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
 2015-11-19 20:47:26 +00:00
Sreeram Ramachandran
4a825ab3ca Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 
am: 5d41bd8d1a

* commit '5d41bd8d1acd894cef1aff9018614194df6f95ab':
  Don't use framework permission strings for netd permissions.
 2015-11-19 17:20:14 +00:00
Sreeram Ramachandran
5d41bd8d1a Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 
am: 6d983179a0

* commit '6d983179a047ff0e69fc06c06d3b9b06c32406ae':
  Don't use framework permission strings for netd permissions.
 2015-11-19 17:10:45 +00:00
Sreeram Ramachandran
6d983179a0 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 
am: 974f805500

* commit '974f8055005a3d75e45cab89badd9ef183a75107':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:59:45 +00:00
Sreeram Ramachandran
974f805500 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 
am: b776891801

* commit 'b7768918014d34c2e4d74abefeb03956aee421fc':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:50:11 +00:00
Sreeram Ramachandran
b776891801 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 
am: 33c1718205

* commit '33c17182058ce0f9d0bae48467827ff52422cdd2':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:40:35 +00:00
Sreeram Ramachandran
33c1718205 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 
am: d3b6e2d790

* commit 'd3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:30:59 +00:00
Sreeram Ramachandran
d3b6e2d790 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd 
am: 42faa221d7

* commit '42faa221d7e8bc6db32698b3528e9c5898dbb943':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:20:26 +00:00
Sreeram Ramachandran
42faa221d7 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 
am: 0b542630dd

* commit '0b542630dd8b4d43f2e4f70563d3e44bb680455f':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:10:19 +00:00
Nicolas Geoffray
642c5da4f0 Merge "Update framework code after new ART options." am: d7d2817ade 
am: 9da4055766

* commit '9da4055766fc7acf81dcd238204589ea1f484d50':
  Update framework code after new ART options.
 2015-11-19 16:05:04 +00:00
Sreeram Ramachandran
0b542630dd Don\'t use framework permission strings for netd permissions. 
am: f1f45fe012

* commit 'f1f45fe012ddbd516e797099994c400a1cac8581':
  Don't use framework permission strings for netd permissions.
 2015-11-19 15:59:42 +00:00
Nicolas Geoffray
9da4055766 Merge "Update framework code after new ART options." 
am: d7d2817ade

* commit 'd7d2817ade8459a8f6872ff814d3208613502858':
  Update framework code after new ART options.
 2015-11-19 15:54:21 +00:00
Nicolas Geoffray
d7d2817ade Merge "Update framework code after new ART options." 2015-11-19 15:48:01 +00:00
Nicolas Geoffray
cdf1dfff8f Update framework code after new ART options. 
Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
 2015-11-19 14:31:23 +00:00
Christopher Tate
9bc2f472e9 Don't back up / restore EAP network definitions 
Bug 25725016

Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
 2015-11-18 13:42:04 -08:00
Andreas Gampe
e2c2eea6aa Merge "Frameworks/base: Make RuntimeAbort more expressive" am: b61d3dd8a7 
am: a7e9f174c1

* commit 'a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
  Frameworks/base: Make RuntimeAbort more expressive
 2015-11-18 18:11:11 +00:00
Andreas Gampe
a7e9f174c1 Merge "Frameworks/base: Make RuntimeAbort more expressive" 
am: b61d3dd8a7

* commit 'b61d3dd8a773be393c738675cff28fc799497535':
  Frameworks/base: Make RuntimeAbort more expressive
 2015-11-18 17:47:52 +00:00
Andreas Gampe
b61d3dd8a7 Merge "Frameworks/base: Make RuntimeAbort more expressive" 2015-11-18 17:16:59 +00:00
Sreeram Ramachandran
f1f45fe012 Don't use framework permission strings for netd permissions. 
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a120442.

Bug: 21900139
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit 0f8f120839120da543ee186cf25ce6e215423e99)
 2015-11-18 17:04:18 +00:00
Nicolas Geoffray
4e390fa8e6 Merge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0 
am: 5485d81578

* commit '5485d815788e4037829d70d041fe4fc1a35416f3':
  Remove DEBUG_JIT from Zygote flags.
 2015-11-18 11:05:23 +00:00
Nicolas Geoffray
5485d81578 Merge "Remove DEBUG_JIT from Zygote flags." 
am: cf49583bd0

* commit 'cf49583bd02d01b5d7aa57912d5469b466722c65':
  Remove DEBUG_JIT from Zygote flags.
 2015-11-18 10:54:19 +00:00
Nicolas Geoffray
cf49583bd0 Merge "Remove DEBUG_JIT from Zygote flags." 2015-11-18 10:47:50 +00:00
Nicolas Geoffray
245ec92b65 Remove DEBUG_JIT from Zygote flags. 
The flag is being obsolete by the move to JIT.

(cherry picked from commit 9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)

Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
 2015-11-18 10:07:53 +00:00
Andreas Gampe
b053cce7ae Frameworks/base: Make RuntimeAbort more expressive 
Pass a message to FatalError, which will be more prominent in
aborts than "RuntimeAbort."

Change-Id: Icb3b8f50ca0cc15fd1346c530cd8e6452e951879
 2015-11-17 16:38:59 -08:00
Diego Perez
49bc166108 Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev 
am: 603544d4c4

* commit '603544d4c42cd8e0cc46da04f28a8fead64665e3':
  Fix delegation of methods within inner static classes
 2015-11-17 22:43:16 +00:00
Joe LaPenna
7a3db8cc4d Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a 
am: f7aceb60e3

* commit 'f7aceb60e3e0d6ec611b3fa2dd64e6e4e1196f4c':
  Revert "Don't dispatch when non-interactive and the display is off."
 2015-11-17 22:41:49 +00:00
Stephen Hines
619a35b9e9 Merge "Remove unsupported RS graphics API tests." am: 7ea808b177 
am: 5a0a713147

* commit '5a0a713147a76195ae21d53d065633f117271793':
  Remove unsupported RS graphics API tests.
 2015-11-17 22:37:35 +00:00
Diego Perez
603544d4c4 Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev 2015-11-17 22:34:08 +00:00
Joe LaPenna
f7aceb60e3 Revert "Don\'t dispatch when non-interactive and the display is off." 
am: f2b9b2d85a

* commit 'f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb':
  Revert "Don't dispatch when non-interactive and the display is off."
 2015-11-17 22:32:57 +00:00
Stephen Hines
5a0a713147 Merge "Remove unsupported RS graphics API tests." 
am: 7ea808b177

* commit '7ea808b17736f690eb8d23729f33e9a612b0492c':
  Remove unsupported RS graphics API tests.
 2015-11-17 22:28:45 +00:00
Joe LaPenna
f2b9b2d85a Revert "Don't dispatch when non-interactive and the display is off." 
This reverts commit 2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28.

BUG: 22422588
BUG: 25067918

Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775
 2015-11-17 22:26:41 +00:00
Stephen Hines
7ea808b177 Merge "Remove unsupported RS graphics API tests." 2015-11-17 22:16:35 +00:00
Michael Wright
c85b56b0cb DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e 
am: 8aa7e6a21a

* commit '8aa7e6a21a3428741159de2e28d87acb8b420e96':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 21:37:25 +00:00
Michael Wright
8aa7e6a21a DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 
am: 41ef58be3e

* commit '41ef58be3e5a968c58ed138861ab6a0f7ff013a6':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 21:18:16 +00:00
Chad Brubaker
1627a091f4 Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 
am: 97f92ce41e

* commit '97f92ce41e66b54e56733f18bdaae056f08c0ae7':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 21:18:12 +00:00
Michael Wright
41ef58be3e DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 
am: 08ed2bc083

* commit '08ed2bc083fe142ea6f89f97172543327f423e61':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:59:42 +00:00
Chad Brubaker
97f92ce41e Merge "Add NetworkSecurityConfigProvider.install" 
am: 08181cf647

* commit '08181cf647b1a1e440528f3f58ef6bf4e98a4832':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 20:59:04 +00:00
Deepanshu Gupta
377cc4887d Revert "LayoutLib: Fix true transparency in status bar." 
am: 4ea74d2960

* commit '4ea74d2960688db6aa13452765dd5f2d07a40189':
  Revert "LayoutLib: Fix true transparency in status bar."
 2015-11-17 20:50:07 +00:00
Chad Brubaker
08181cf647 Merge "Add NetworkSecurityConfigProvider.install" 2015-11-17 20:46:49 +00:00
Michael Wright
08ed2bc083 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours 
am: 18a2ac0506

* commit '18a2ac0506ec834c2522de94040dab9e77304e7b':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:41:39 +00:00
Deepanshu Gupta
dd97829cf2 Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev 
am: 42a893b50b

* commit '42a893b50b2763d7a2a3da4006c9433afaf86cfd':
  AppCompatActionBar: use findClass to test presence
 2015-11-17 20:32:31 +00:00
Deepanshu Gupta
4ea74d2960 Revert "LayoutLib: Fix true transparency in status bar." 
This reverts commit 4eb298a941c3f465944b63f1a06518e911681c89.

Even though this is techinically closer to what the framework does, the
fix is not complete. As a result, it looks worse when using AppCompat
themes. Revert the change for the release.

Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f
 2015-11-17 12:25:25 -08:00
Michael Wright
18a2ac0506 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 
am: bd23716585  -s ours

* commit 'bd23716585bd21b4dc4bf87bd56ce588c8d457df':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:24:16 +00:00