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

213723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
867c370465 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:52 +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
Robin Lee
5145df278b DevicePolicy: Always send ACTION_PASSWORD_CHANGED 
The old check looks a lot like an equality check, but it's not valid
because two passwords can share the same parameters.

For example:
  '11Aa' and
  'Y99z'

Are not different according to the old logic.

Bug: 25319928
Change-Id: Ia69861d9103670d1fc1dbf0130516e18e85e8de0
 2015-11-19 19:45:44 +00:00
Sreeram Ramachandran
38a3b2154c 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 
am: c1552f0caf

* commit 'c1552f0caf26bc79e5de6fdd15aa97900d6fd4aa':
  Don't use framework permission strings for netd permissions.
 2015-11-19 17:30:05 +00:00
Sreeram Ramachandran
c1552f0caf 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:09 +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
5d5f055eb6 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:01 +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
Vineeta Srivastava
cb948af246 Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev 
am: 013c7daedd

* commit '013c7daedd6be8a6a90b8c5e34de70be4144e746':
  Fix MVNO hotspot bug for Europe
 2015-11-19 05:50:36 +00:00
Vineeta Srivastava
013c7daedd Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev 2015-11-19 00:22:59 +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
Amit Mahajan
8ed715e31e Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages() 
Bug: 23067429
Change-Id: Ia66fd1a6ff248520e86f6e502767b22c4d9d4814
 2015-11-18 19:56:47 +00:00
Andreas Gampe
e3ad4409a6 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
Guang Zhu
b681ec0219 add lost RAM info to compact meminfo dump 
am: 877c6c7742

* commit '877c6c7742d60fae387e51a4257dd90010064a8a':
  add lost RAM info to compact meminfo dump
 2015-11-18 18:11:10 +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
Nicolas Geoffray
5462e46d23 Merge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0 
am: 5485d81578

* commit '5485d815788e4037829d70d041fe4fc1a35416f3':
  Remove DEBUG_JIT from Zygote flags.
 2015-11-18 17:21:41 +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
Alex Deymo
8d31b08904 Merge "Remove the aidl tool" into mnc-dr2-dev 2015-11-18 16:39:09 +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
Guang Zhu
877c6c7742 add lost RAM info to compact meminfo dump 
Bug: 25756675

Change-Id: Ibfa37dac99268de8b482188eca9924c999e2b484
 2015-11-18 07:43:50 +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
f9281b6dfe Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4 am: 14a826380d 
am: 0b76d094c6

* commit '0b76d094c6e121f21135d851e4ee6ce8b6ee625f':
  Fix delegation of methods within inner static classes
 2015-11-18 00:13:20 +00:00
Joe LaPenna
01186abc81 Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a am: f7aceb60e3 am: 2900dc2349 
am: 617bd39465

* commit '617bd39465dd0b77ed2cf353728c2fe97c371b17':
  Revert "Don't dispatch when non-interactive and the display is off."
 2015-11-18 00:12:02 +00:00
Michael Wright
69e4ce3a6f 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 am: 78f974a0b2 
am: c173429617

* commit 'c173429617d2a8779f6a4a6ade5a9991f65f751b':
 2015-11-18 00:10:45 +00:00
Deepanshu Gupta
00a3f4b32e Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 am: d67897e4fb 
am: 6058efff69

* commit '6058efff6991e390cfd06540130bdf4407da7522':
 2015-11-18 00:09:19 +00:00
Deepanshu Gupta
cd8e8ea0eb Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b am: ef4050128a 
am: 0a9b4e5f00

* commit '0a9b4e5f00fcc0f785085e642b7894fa14f16e0b':
 2015-11-18 00:07:49 +00:00
Deepanshu Gupta
aec98e3a7e LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8 
am: e45abdb126

* commit 'e45abdb1267781c2f3f4fa65cb8771c5d01d0956':
 2015-11-18 00:06:20 +00:00
Michael Wright
1c996ff5b4 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719 
am: cd00ba1a71

* commit 'cd00ba1a71bbb9edf92a0cc5def975be86207e4e':
 2015-11-18 00:04:52 +00:00
Bryce Lee
20ef5a3f44 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 am: e2861471b9 
am: 52d93db91d

* commit '52d93db91dcf883f236c7b1e75d1dd4b2421a1d3':
 2015-11-18 00:03:17 +00:00
Joe LaPenna
5431e73f14 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours am: dbe1804f58 -s ours 
am: 9cb81aa210  -s ours

* commit '9cb81aa210419ea14ff396fb533ad500094b00f2':
 2015-11-18 00:01:52 +00:00
Sanket Padawe
0106bef2fa Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 am: 7bb34d7517 
am: fc8f7cee01

* commit 'fc8f7cee0124bee1c75f05a18c112e37705836a9':
 2015-11-18 00:00:25 +00:00
Deepanshu Gupta
da5929914b Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7 
am: 9f275ec3fd

* commit '9f275ec3fd422045f95c048905b112c0a93f4d34':
 2015-11-17 23:58:48 +00:00
Michael Kwan
4cb17f362e DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours am: b0aae584ea -s ours 
am: 2c8f3734af  -s ours

* commit '2c8f3734afd5f104166bfb045794970414eb5052':
 2015-11-17 23:57:12 +00:00
Rom Lemarchand
7d1428d7f3 resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp. 
Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f
 2015-11-17 15:38:50 -08:00
Bryce Lee
cac50775b2 Add callback for connections to be notified when the ringer is silenced. 
Bug: 25644529
Change-Id: Ie7dc9028cf6243d98b2d87ca4c8b3ffcd31e3676
 2015-11-17 15:13:29 -08:00