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

230296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Poromov
b998532be8 Update bmgr cmd line tool to use requestBackup() API in BackupManager 
The new command works as "bmgr backupnow [list of packages]"
This change should be submitted after ag/834173

Change-Id: Ie1cdd18a38653dd71a1d499620dd2afec3cbbb24
 2016-01-22 13:15:06 +01:00
Oleksandr Peletskyi
b7cc096fd4 Merge "Added restriction if a user is allowed to change the icon. BUG: 25305966" 2016-01-21 20:25:46 +00:00
Matt Wu
6c09ff5560 Merge "Set WindowSession's touchmode when in local focus mode," 2016-01-21 20:09:36 +00:00
Oleksandr Peletskyi
7f1f1dfc87 Added restriction if a user is allowed to change the icon. 
BUG: 25305966

Change-Id: I3d527224f00087b2bd959879ebb143e2ecb9c914
 2016-01-21 20:49:32 +01:00
Alan Viverette
dd26bfc13e Merge "Remove unnecessary @inheritDoc, add missing @Override to ViewGroup" 2016-01-21 19:49:00 +00:00
Matthew Williams
b7a73360b5 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d am: 08d7e9608e am: c151cec56e am: 4831ef3872 am: d877135d61 
am: caf53acdd7  -s ours

* commit 'caf53acdd7d4d1c2ec4d5678aa9b6a1c5c1340f8':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:30:43 +00:00
Matthew Williams
caf53acdd7 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d am: 08d7e9608e am: c151cec56e am: 4831ef3872 
am: d877135d61

* commit 'd877135d616321b4b3013b302e8615a8f8b04ffa':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:25:51 +00:00
Matthew Williams
d877135d61 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d am: 08d7e9608e am: c151cec56e 
am: 4831ef3872

* commit '4831ef3872f7f5c5d2ea0838f0958412e3833aeb':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:20:31 +00:00
Adam Powell
db33840518 Merge "Init child fragments consistently with activity fragments" 2016-01-21 19:19:01 +00:00
Phil Weaver
75fab6b8bc Merge "Pass drawing order information to accessibility." 2016-01-21 19:17:48 +00:00
Matthew Williams
4831ef3872 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d am: 08d7e9608e 
am: c151cec56e

* commit 'c151cec56ec3666b5bb20e8cf7c3dca2500ea353':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:13:32 +00:00
Siyamed Sinir
92b9747f1c Merge "Sort the result of SpannableStringBuilder.getSpans" 2016-01-21 19:12:28 +00:00
Matthew Williams
c151cec56e DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d 
am: 08d7e9608e

* commit '08d7e9608ea822815b15be15a66f26be664ce541':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:08:07 +00:00
Kenny Guy
8c32981f12 Merge "Update PackageMonitor and LauncherApps for suspended apps." 2016-01-21 19:04:20 +00:00
Matthew Williams
08d7e9608e DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours 
am: 5cb2597a9d

* commit '5cb2597a9da3202229fdbc91c12b8e172b2b5667':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:01:02 +00:00
Sergey Poromov
d3665f1f0f Merge "Introduce BackupManager#requestBackup & BackupObserver API" 2016-01-21 18:55:28 +00:00
Matthew Williams
5cb2597a9d DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 
am: 1f6dbd910b  -s ours

* commit '1f6dbd910bf9bf93df8a708209e92add61fbff44':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:54:44 +00:00
Matthew Williams
1f6dbd910b DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 
am: 9e52b29fe2

* commit '9e52b29fe27035df4720db582637157ce9ce268d':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:48:55 +00:00
Andrei Stingaceanu
3bcf800c50 Suspend apps - block 
* kill app when suspending
* block starting ONLY activities for suspended apps
* do not allow suspending the device admin package

Bug: 22776761
Change-Id: I3ee5fcb2d6828f363ce0f024dbc662ab29275192
 2016-01-21 18:47:53 +00:00
Rakesh Iyer
03b42004da Merge "Commandeer full screen user switcher for auto." 2016-01-21 18:47:07 +00:00
Matthew Williams
9e52b29fe2 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours 
am: a76208d4e4

* commit 'a76208d4e4f7f690f5fde4210a00a5c3022721bd':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:41:55 +00:00
Amith Yamasani
3a9866d801 Merge "Don't allow user creation intent to work on non-admin users" 2016-01-21 18:40:40 +00:00
Adam Powell
592df7d8c6 Init child fragments consistently with activity fragments 
Fragments contained within an activity are restored from instance
state in FragmentActivity.onCreate, but fragments contained within
another fragment were previously restored from instance state in
performCreate after onCreate returned. This meant that developers
couldn't consistently rely on being able to control when this happens
with a call to super.onCreate, and calls to findFragmentByTag to
reconnect with a restored child fragment would fail in ways that
succeed when the fragment is directly added to an activity.

Change child fragment instance state restore to happen during
Fragment.onCreate instead of in performCreate to be consistent with
activity behavior. Preserve the old behavior for apps targeting
an SDK version < N.

Change-Id: I9c88d5554da9a32219d64c70ca638f75ecb233ed
 2016-01-21 10:38:52 -08:00
Matthew Williams
a76208d4e4 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a 
am: 9c841923df  -s ours

* commit '9c841923dfc36db046909e388b8a2fda3b694be1':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:37:01 +00:00
Phil Weaver
1f2225486d Pass drawing order information to accessibility. 
Bug: 22721935
Change-Id: I45a2be7c174c8b5a469b68a45dec0eb536825d92
 2016-01-21 10:35:26 -08:00
Matthew Williams
9c841923df DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours 
am: 0d3e46391a

* commit '0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:29:33 +00:00
Ritesh Reddy
395371c1d7 Merge "Stopped closing State FDs in AccountSyncSettingsBackupHelper" 2016-01-21 18:20:56 +00:00
Matthew Williams
0d3e46391a DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 
am: 5fc753acaf  -s ours

* commit '5fc753acaf9731742957db256b2818376fe8c4a4':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:19:53 +00:00
Xiaohui Chen
3691d64d6d Merge "sysui: refactor PhoneStatusBar" 2016-01-21 18:17:54 +00:00
Sergey Poromov
fe06bf64d2 Introduce BackupManager#requestBackup & BackupObserver API 
Introduces a way to request immediate backup for list of packages
and receive callbacks on backup progress.

Bug: 25688526
Change-Id: Ib826933d44f4ebf2b981f8be366215b2d37847e2
 2016-01-21 19:15:33 +01:00
Matthew Williams
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:14:32 +00:00
Matthew Williams
06ef7dfdf0 DO NOT MERGE Redact Account info from getCurrentSyncs 
am: a5cafd2a93

* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:07:55 +00:00
Jack Yu
e0a6d6ab8d Merge "Data call retry refactoring" into mm-wireless-dev 
am: 599f62562b

* commit '599f62562b6102f9e3830d5b32a282d23c59e2fd':
  Data call retry refactoring
 2016-01-21 18:07:50 +00:00
Clara Bayarri
27a3888077 Merge "Fix missing clear identity in AMS.AppTaskImpl#moveToFront" 2016-01-21 17:45:59 +00:00
Jason Monk
c9d831d6d6 Merge "Work on QS layouts" 2016-01-21 17:45:04 +00:00
Jack Yu
599f62562b Merge "Data call retry refactoring" into mm-wireless-dev 2016-01-21 17:43:19 +00:00
Clara Bayarri
b3ced57764 Fix missing clear identity in AMS.AppTaskImpl#moveToFront 
Bug: 26683257
Change-Id: Ic70864aa3e33a5362278b498e2763ce8a70e8fe4
 2016-01-21 17:39:51 +00:00
Xiaohui Chen
8bdcd1fcaa sysui: refactor PhoneStatusBar 
Change-Id: I4177d1d02fbafc88ad522bc483e22a68ede075ff
 2016-01-21 17:35:19 +00:00
Sergio Giro
d697463dd9 Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser" am: eb93182dfb 
am: e2296d490d

* commit 'e2296d490dba8dad4d3d0831d94c4194c9ed37f3':
  org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
 2016-01-21 17:25:12 +00:00
John Reck
4bad0534e5 Merge "Ensure Texture always binds to self" 2016-01-21 17:21:05 +00:00
Sergio Giro
e2296d490d Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser" 
am: eb93182dfb

* commit 'eb93182dfb862df27e479d30c7b8e12f13e5def5':
  org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
 2016-01-21 17:20:41 +00:00
Ben Wagner
4b461babcb Merge "Remove NanumGothic and DroidSansFallback from fonts.xml." 2016-01-21 17:13:05 +00:00
John Reck
66f65cb345 Ensure Texture always binds to self 
Bug: 26584230

In the event that Texture decides it doesn't
need to actually call glTexImage2D/glSubTexImage2D
it needs to still activateTexture(0) and bindTexture(mId)
as this is the expected state after Texture::upload()
is called.

Change-Id: I62d689a9057907a10dda2bc8f40c3113e43b93b2
 2016-01-21 09:08:42 -08:00
Sergio Giro
eb93182dfb Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser" 2016-01-21 17:08:21 +00:00
Youngsang Cho
6c1e1544bc Merge "Close picture-in-picture when a fullscreen app starts to play a video" 2016-01-21 17:08:05 +00:00
Youngsang Cho
ad8ceb037e Close picture-in-picture when a fullscreen app starts to play a video 
Bug: 26549507
Change-Id: I27e8f7b1847bf0e34e7c47bf6303c425c3eb9127
 2016-01-21 17:06:32 +00:00
Sergio Giro
ab72367506 org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser 
The name DistinguishedNameParser is used by other libraries having the
same package, and some apps incorrectly include packages that are
present in the boot classpath. This relatively newly introduced
DistinguishedNameParser ends up hiding the ones in the libraries.

Bug: 26647082
Change-Id: I735aef3c1e5dd04e5a8e2eda6da6d9c9179f1c70
 2016-01-21 17:04:58 +00:00
Ben Wagner
8466f3c879 Remove NanumGothic and DroidSansFallback from fonts.xml. 
These two fonts are no longer installed on a device.
This leaves the fonts themselves in place for the sdk build.

Change-Id: Ib69e73a6682d7eedd7b824f1dadc79cbccf07605
 2016-01-21 11:54:06 -05:00
Philip P. Moltmann
670d54c8e3 Merge "Treat empty strings similar to null-strings when composing the subtitle in the SelectPrinterActivity." 2016-01-21 16:06:45 +00:00
Philip P. Moltmann
5b012d4654 Merge "Shorten LOG_TAGs to fit in 23 characters as commented on by lint." 2016-01-21 16:06:17 +00:00