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

222582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
3944c81cd7 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 18:49:50 +00:00
Ritesh Reddy
f8f121330e Enabled backup/restore of Charging Sounds 
Included the charging_sounds key in the Settings to backup/restore

Bug: 25694355
Change-Id: I4a8653f32b58ab326019698784b8cf60c6c0220e
 2015-11-20 18:41:08 +00:00
Chris Tate
3d4e969f4f Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde am: b5a38f6da5 
am: 96333c2e8c

* commit '96333c2e8cd13df55e8c878925f8cd2e9c90ac42':
  Don't back up / restore EAP network definitions
 2015-11-20 18:15:52 +00:00
Wale Ogunwale
3856bf7fb9 Fixed unexpected configuration change causing activity relaunch 
In commit ebcc875f we migrated the setting of the task override
configuration from WM to AM. However, the migration changed the
construction of the override configuration to take in the service
configuration as the starting value. This is incorrect since the
only values that should be set in the override configuration are
the ones that change due to resizing. We now seed the override
configuration with the EMPTY value to make it obvious that the
object should be constructed with the default values.

Also, fixed issue with WM telling activity manager to resize a stack
when the stack is already the size it wants.

Bug: 25776219
Change-Id: I882979aa87b49e7a5dc993bd9223fbd6e6cf6471
 2015-11-20 10:13:13 -08:00
Chris Tate
96333c2e8c Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde 
am: b5a38f6da5

* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
  Don't back up / restore EAP network definitions
 2015-11-20 18:10:21 +00:00
Chris Tate
b5a38f6da5 Merge "Don\'t back up / restore EAP network definitions" 
am: 14a0981fde

* commit '14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
  Don't back up / restore EAP network definitions
 2015-11-20 18:05:04 +00:00
Chris Tate
14a0981fde Merge "Don't back up / restore EAP network definitions" 2015-11-20 18:01:10 +00:00
Jim Kaye
5b77f70d8b Extend the 'qwerty' key layout 
Add the App Switch (Recents) key.
Add media control keys.

These are needed to support Emulator UI
buttons for these functions.

Change-Id: I5d5d25a77625bfd831cf7b31c126fd342efc6c5b
 2015-11-20 09:59:25 -08:00
Ricky Wai
9f8b27b4ea Merge "Add ContactsContract.Contacts.CORP_CONTENT_FILTER_URI" 2015-11-20 17:37:47 +00:00
Steve McKay
6c88085547 Intent-filter for BROWSE action. 
Missing from ag/777423
Bug: 25806013

Change-Id: I79ac0946f0d4548efab23e363dfa864ad8b1426a
 2015-11-20 08:52:00 -08:00
Nicolas Prevot
caf11cdc12 Add extra in DevicePolicyManager to colorize the provisioning. 
The dpc may pass an extra to indicate a color that will be used
to colorize the provisioning.

BUG:25678389
Change-Id: I8b818cca3dbb5300cec2de7b861bdff90200cf7c
 2015-11-20 16:18:30 +00:00
Mahaver Chopra
1dc510eb5b Disable multiple user for corp-liable mode 
Bug: 25443050
Change-Id: Iad34e7ad0d3679626880f905f9bab9b6c2a192ed
 2015-11-20 16:10:42 +00:00
Przemyslaw Szczepaniak
f1e5201693 Stop preloading fortress classes 
(cherry-picked from 90d8781876643dc730aecee20f34dbe9e695653c)

Change-Id: If184fe9e40ba4c21fdb05d38c2975abfb4d0410b
 2015-11-20 15:42:51 +00:00
Przemyslaw Szczepaniak
3f72604be8 Use HexDump instead of java.lang.IntegralToString 
java.lang.IntegralToString is being removed, replaced
all its usage by com.android.internal.util.HexDump.

Bug: 24932279
(cherry-picked from 15fc0548a536750110e159e06a39ba943eccdd81)

Change-Id: Id6ab88337af12d93cd73c41775b9d5baa1e61d96
 2015-11-20 14:11:02 +00:00
Alan Viverette
1f740d72ad Merge "Set mTempCalendar in TimePickerSpinnerDelegate" 2015-11-20 14:10:48 +00:00
Piotr Jastrzebski
cfa292e1da Add core-oj to the list of core library jars. 
With some core classes moved to separate core-oj jar
we need to use the new jar.

(cherry-picked from f898cda2f499b14f92bc7fb75f44110cdec7654f)

Change-Id: Ica148f11bcc77f57d22944ff78c501611a293167
 2015-11-20 14:06:55 +00:00
Ricky Wai
a5efc47723 Add ContactsContract.Contacts.CORP_CONTENT_FILTER_URI 
Bug: 25797489

Change-Id: I0b862c1b179cffd3591e5082d6f9102a070a4053
 2015-11-20 12:44:56 +00:00
Ricky Wai
4133dee9ec Merge "Add Work Contacts Directory APIs" 2015-11-20 12:33:11 +00:00
Sudheer Shanka
d7b43dd4bb Merge "Add per-user version of DevicePolicyManager.getUserRestrictions." 2015-11-20 12:23:54 +00:00
Nicolas Prévot
5bd8bfe95c Merge "Add an extra for the logo uri to DevicePolicyManager." 2015-11-20 11:37:02 +00:00
Tomasz Mikolajewski
a8057a9dce Add first-class support for virtual files in SAF. 
Bug: 20820363
Change-Id: Ic509a6003a99997126f129a836fdd8c0e843108f
 2015-11-20 16:26:18 +09:00
Seigo Nonaka
f58bc8d159 Merge "Make Paint.hasGlyph variation selector aware." 2015-11-20 05:45:26 +00:00
Geoff Mendal
8c9d1922f3 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours am: fd773d1ba7 -s ours am: b1a5fef946 -s ours 
am: 4943634c10  -s ours

* commit '4943634c10e7973400404e9e6b0b7de0b494f770':
  Import translations. DO NOT MERGE
 2015-11-20 03:56:34 +00:00
Deepanshu Gupta
17dc40e642 Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 am: 2d887558df am: 0627cd0c40 
am: adca23bb4c

* commit 'adca23bb4c59b1514b5d86f1ab8100c400d7a71e':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
 2015-11-20 03:55:07 +00:00
Deepanshu Gupta
760a214168 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465 am: 4d9df358ec 
am: 138a901db4

* commit '138a901db492989ae7db53d664cac698cc5bfdc7':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
 2015-11-20 03:53:45 +00:00
Sreeram Ramachandran
cbc49d0841 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 am: 38a3b2154c 
am: 9ebdd27142

* commit '9ebdd271422cb4a091f3b467899506cebb0fa944':
  Don't use framework permission strings for netd permissions.
 2015-11-20 03:52:20 +00:00
Vineeta Srivastava
f0de74e12d Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd am: cb948af246 
am: 8e8c12acfa

* commit '8e8c12acfa946346a28c031653aa93caaee7c7cb':
  Fix MVNO hotspot bug for Europe
 2015-11-20 03:50:46 +00:00
Rob Carr
c954780a5a Merge "Prevent SurfaceView flash while resizing." 2015-11-20 02:45:20 +00:00
Robert Carr
84b0574cec Prevent SurfaceView flash while resizing. 
We need to make sure we do not preserve
and destroy attached windows when entering
drag resize as we will not swap these windows
to the big surface. On a similar note,
we need to make sure we do not hide child windows
when destroying the parent window for preservation.

Change-Id: I98e02f08d0ea2d5f0032ec7691e865c536df19c6
 2015-11-20 02:43:24 +00:00
Geoff Mendal
4943634c10 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours am: fd773d1ba7 -s ours 
am: b1a5fef946  -s ours

* commit 'b1a5fef946bf5ec1c9bb59696cad9534ba72190b':
  Import translations. DO NOT MERGE
 2015-11-20 01:56:21 +00:00
Deepanshu Gupta
adca23bb4c Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 am: 2d887558df 
am: 0627cd0c40

* commit '0627cd0c404838a0251ee359ed75041f430fa83b':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
 2015-11-20 01:55:01 +00:00
Deepanshu Gupta
138a901db4 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 am: 867c370465 
am: 4d9df358ec

* commit '4d9df358ec847262872c09962105537be350f8fd':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
 2015-11-20 01:53:43 +00:00
Sreeram Ramachandran
9ebdd27142 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 
am: 38a3b2154c

* commit '38a3b2154c7ee5d75b5670abaa4c154edd3c36eb':
  Don't use framework permission strings for netd permissions.
 2015-11-20 01:52:25 +00:00
Vineeta Srivastava
8e8c12acfa Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am: 013c7daedd 
am: cb948af246

* commit 'cb948af2469ca3869d368c0162dd459912afb0b9':
  Fix MVNO hotspot bug for Europe
 2015-11-20 01:51:01 +00:00
Guang Zhu
b2d8e4f0f3 Merge "resolve merge conflicts of 723462eba9 to master." 2015-11-20 01:46:25 +00:00
Guang Zhu
d550225835 resolve merge conflicts of 723462eba9 to master. 
Change-Id: I34f085ba12ab2602a144a2cbd933cfd5c030748f
 2015-11-19 17:43:28 -08:00
Geoff Mendal
b1a5fef946 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours 
am: fd773d1ba7  -s ours

* commit 'fd773d1ba76c29b8888c71906ef44ec09a551627':
  Import translations. DO NOT MERGE
 2015-11-20 01:40:42 +00: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
Alex Deymo
12262af418 Merge "Remove the aidl tool" into mnc-dr2-dev am: 8d31b08904 
am: f7d10eca49

* commit 'f7d10eca499fee37d8dfc89ec6779a7b46c70be5':
  Remove the aidl tool
 2015-11-20 00:18:01 +00:00
Guang Zhu
723462eba9 add lost RAM info to compact meminfo dump am: 877c6c7742 
am: b681ec0219

* commit 'b681ec02194039768767215b2479507742288c98':
  add lost RAM info to compact meminfo dump
 2015-11-20 00:01:31 +00:00
Steve McKay
acd29b5c99 Merge "Add "Home" directory support." 2015-11-20 00:01:25 +00:00
Steve McKay
c6a4cd8c0f Add "Home" directory support. 
Update FilesActivityUiTests to verify Home is present
    and that clicking a root sets the title accordingly.
Guard addition of WRITABLE flag with a volume test.

Bug: 25147243
Change-Id: Ic20372737cae08a82af0aade0c0dbbd8c22d5f34
 2015-11-19 15:56:05 -08:00
Fyodor Kupolov
7f35036c95 Merge "Added a placeholder home activity for system user" 2015-11-19 23:52:45 +00:00
Alex Deymo
f7d10eca49 Merge "Remove the aidl tool" into mnc-dr2-dev 
am: 8d31b08904

* commit '8d31b089040dafefee16033176a884d43e259804':
  Remove the aidl tool
 2015-11-19 23:50:25 +00:00
Roozbeh Pournader
cf8c77464a Merge "Support LocaleLists in ActivityManagerService." 2015-11-19 23:44:22 +00:00
Adam Lesinski
78de1bcbbd Merge "AAPT2: Fail compiling when private symbols are referenced" 2015-11-19 23:43:08 +00:00
Jorim Jaggi
7c149b5295 Merge "Add gesture to drag in recents from navigation bar" 2015-11-19 23:23:01 +00:00