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

206234 Commits

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

* commit 'b21b7785678f08e939dbe2e7d7cb5eedae47e1c4':
  Import translations. DO NOT MERGE
 2015-11-23 13:36:02 +00:00
Geoff Mendal
b21b778567 Import translations. DO NOT MERGE 
Change-Id: Id46055ddba8834518c0faf5e0dd95d883dd79542
Auto-generated-cl: translation import
 2015-11-23 14:26:59 +01:00
Adam Lesinski
888916ff0f DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing 
am: 6902052c77  -s ours

* commit '6902052c77bbcb9078b4ced243874f67542f64f9':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
 2015-11-20 20:14:08 +00:00
Adam Lesinski
6902052c77 DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing 
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.

Bug:25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
 2015-11-20 10:58:02 -08:00
Geoff Mendal
fd773d1ba7 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours 
am: 1bd58bfd5b  -s ours

* commit '1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
  Import translations. DO NOT MERGE
 2015-11-20 01:30:35 +00:00
Geoff Mendal
1bd58bfd5b Import translations. DO NOT MERGE am: bddde9b83d -s ours 
am: d0709c3a32  -s ours

* commit 'd0709c3a329ce555d9d968bc1808fec5bcc1fb10':
  Import translations. DO NOT MERGE
 2015-11-20 01:25:11 +00:00
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
2d887558df 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:17 +00:00
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
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
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
Vineeta Srivastava
013c7daedd Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev 2015-11-19 00:22: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
Guang Zhu
877c6c7742 add lost RAM info to compact meminfo dump 
Bug: 25756675

Change-Id: Ibfa37dac99268de8b482188eca9924c999e2b484
 2015-11-18 07:43:50 +00:00
Diego Perez
14a826380d 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:15 +00:00
Joe LaPenna
2900dc2349 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:46 +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
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
Michael Wright
78f974a0b2 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:27 +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
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
Deepanshu Gupta
d67897e4fb 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
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
ef4050128a 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:28 +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
Deepanshu Gupta
42a893b50b Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev 2015-11-17 20:22:43 +00:00
Michael Wright
bd23716585 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de 
am: 614ea46405

* commit '614ea464051835e1c2267ef2bc343f98b62b177a':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:06:27 +00:00
Michael Wright
614ea46405 DO NOT MERGE. Prevent recents from coming up when in SUW 
am: 84669ca8de

* commit '84669ca8de55d38073a0dcb01074233b0a417541':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:52:13 +00:00
Deepanshu Gupta
66840955d8 LayoutLib: IntelliJ changed project files. 
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 19:51:52 +00:00
Deepanshu Gupta
22931224d9 LayoutLib: IntelliJ changed project files. 
Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
 2015-11-17 11:37:35 -08:00
Deepanshu Gupta
99b54b364b AppCompatActionBar: use findClass to test presence 
To test the presence of WindowDecorActionBar class, use findClass()
instead of loadClass() which logs warnings.

Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98
 2015-11-17 11:34:32 -08:00
Michael Wright
e2af036719 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab 
am: 053f241cc7

* commit '053f241cc7cc23f41fde42c6a0c9ecf2f8cd2830':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:05:20 +00:00
Michael Wright
053f241cc7 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 
am: c73255d8ab

* commit 'c73255d8abb343dc88ea56f7f8f5d2fd3dcfeb63':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:57:03 +00:00
Michael Wright
c73255d8ab Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 
am: 313c7b2ee0

* commit '313c7b2ee07ea74ac184294e4a6133a813bfcabf':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:49:32 +00:00
Michael Wright
313c7b2ee0 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev 
am: 4aa1e48a71

* commit '4aa1e48a71df78fed20ac4105a2bd97ff04addf7':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:40:21 +00:00
Michael Wright
4aa1e48a71 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev 2015-11-17 18:33:38 +00:00