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

188532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shawn Willden
250dd26291 am 763100e6: am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." 
* commit '763100e6442494a85cfcb7949c8021836071b1f6':
  Unbreak obtaining symmetric keys from AndroidKeyStore.
 2015-04-15 18:21:41 +00:00
Shawn Willden
763100e644 am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." 
* commit '1cb119d3f0945f2194d400b7f186df92bbb25567':
  Unbreak obtaining symmetric keys from AndroidKeyStore.
 2015-04-15 18:10:04 +00:00
Tom Hudson
aaa2970565 Merge "Fix positioned text bounds" 2015-04-15 18:04:28 +00:00
Jay Shrauner
773535cf04 Merge "Remove deprecated telecom APIs. Mark others final." 2015-04-15 18:03:24 +00:00
Shawn Willden
1cb119d3f0 am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." 
* commit '71ba4e461f7a492b44632e282e6480345ac4b9c8':
  Unbreak obtaining symmetric keys from AndroidKeyStore.
 2015-04-15 17:59:41 +00:00
Eino-Ville Talvala
e9e5a162c0 Merge "Camera2: Add prepare method for output buffer pre-allocation" 2015-04-15 17:56:39 +00:00
Tom Hudson
20c2b3ef74 Fix positioned text bounds 
drawPosText() bounds weren't taking their offset into account properly
in absolute-positioned cases.

R=djsollen@google.com
BUG=skia:3673

Change-Id: Ic39fd45491231ed3e3949ffbc1f063a4fc12c3f8
 2015-04-15 13:54:32 -04:00
Wale Ogunwale
ad83f87bcf Merge "@hide Binder#blockUntilThreadAvailable API" 2015-04-15 17:38:17 +00:00
Shawn Willden
71ba4e461f Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." 2015-04-15 17:37:37 +00:00
Benjamin Franz
47af53ed95 Merge "Introduce device owner API to disable the status bar" 2015-04-15 17:22:40 +00:00
Jay Shrauner
560a833806 Merge "Hide Voicemail APIs" 2015-04-15 16:40:33 +00:00
Ricky Wai
b872be875a Merge "Fix ApplicationPackageManager.getDrawable() should drawable result" 2015-04-15 16:39:05 +00:00
Ricky Wai
3ce4625ac6 Fix ApplicationPackageManager.getDrawable() should drawable result 
Bug: 20247312
Change-Id: I6cec3bac794006e41ca85035c572843c92938517
 2015-04-15 16:38:19 +00:00
Chris Craik
4b46ed3b42 Merge "Simplify state in View#draw(canvas, parent, drawingTime)" 2015-04-15 16:37:37 +00:00
Yorke Lee
114b78bf1a Merge "Changes for TelecomManager API review" 2015-04-15 16:30:46 +00:00
Wale Ogunwale
8d90634aab @hide Binder#blockUntilThreadAvailable API 
Bug: 19297165
Change-Id: I15f1139330830b95d7078a5eedd6def794cca6a7
 2015-04-15 09:10:03 -07:00
Benjamin Franz
ea2ec97f37 Introduce device owner API to disable the status bar 
Let the device owner disable the status bar to achieve multi-app single purpose
mode. When the status bar is disabled, quick settings, notifications and the
assist gesture are blocked.

Bug: 19533026
Change-Id: I72830798135136e5edc53e5e2221aebb9a7c7d57
 2015-04-15 15:57:14 +01:00
John Reck
f7a61483bc Merge "A bunch more cleanups" 2015-04-15 14:48:19 +00:00
Geoff Mendal
50d9509c34 am 360d0f61: (-s ours) Import translations. DO NOT MERGE 
* commit '360d0f615eebe5aba0fa574acf81459cca8dd1f0':
  Import translations. DO NOT MERGE
 2015-04-15 14:38:54 +00:00
Geoff Mendal
360d0f615e Import translations. DO NOT MERGE 
Change-Id: Ic858a50c432b07464acba53ea9775aab3e98c633
Auto-generated-cl: translation import
 2015-04-15 07:28:29 -07:00
Geoff Mendal
acb221fd04 Merge "Import translations. DO NOT MERGE" 2015-04-15 14:24:58 +00:00
Geoff Mendal
d6f5926fd9 Import translations. DO NOT MERGE 
Change-Id: I8808553e1586e7c996c60ee9903fbd47293f52a1
Auto-generated-cl: translation import
 2015-04-15 07:24:02 -07:00
Geoff Mendal
7526611f51 Merge "Import translations. DO NOT MERGE" 2015-04-15 13:00:52 +00:00
Geoff Mendal
366c18b74d Import translations. DO NOT MERGE 
Change-Id: I44ddb37b2a54af8c7b9861f362a5a2af2ded02e7
Auto-generated-cl: translation import
 2015-04-15 05:54:00 -07:00
Wale Ogunwale
cc3c34c967 Merge "Added watchdog monitor for Binder threads availability." 2015-04-15 12:35:34 +00:00
Geoff Mendal
017ed840fa Merge "Import translations. DO NOT MERGE" 2015-04-15 12:33:59 +00:00
Geoff Mendal
abe227efc0 Import translations. DO NOT MERGE 
Change-Id: Ia143e1bd7c7cee3497b8ea298dc8286147da8bbd
Auto-generated-cl: translation import
 2015-04-15 05:33:25 -07:00
Geoff Mendal
b47a7fe7c6 Import translations. DO NOT MERGE 
Change-Id: Ia8ffbde888155d62a59ca824069187db7b9895b8
Auto-generated-cl: translation import
 2015-04-15 05:16:32 -07:00
Lorenzo Colitti
e9a88a3844 Merge changes from topic 'no_internet' 
* changes:
  Add a noInternetAccessExpected boolean to WifiConfiguration.
  Prompt if a network without an Internet connection is selected
  Give SystemUI the OVERRIDE_WIFI_CONFIG permission.
  Add an UNKNOWN_UID constant to WifiConfiguration.
 2015-04-15 11:48:22 +00:00
Michael Wright
fdddb4eb69 Merge "Mark AVRCP devices as internal." 2015-04-15 11:38:58 +00:00
Michael Wright
40832ac395 am 6fb80b70: am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()" 
* commit '6fb80b704e7808e4e7cd15f6ccade1e4b6406b56':
  fix return value scale of notifyANR()
 2015-04-15 11:32:31 +00:00
Michael Wright
6fb80b704e am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()" 
* commit '99e23088843eddede29d0fc5ca30a83f147f31b0':
  fix return value scale of notifyANR()
 2015-04-15 11:21:06 +00:00
Michael Wright
99e2308884 am 150e0e87: Merge "fix return value scale of notifyANR()" 
* commit '150e0e87e1faa01f927cfe8c7110ef843612a1df':
  fix return value scale of notifyANR()
 2015-04-15 11:10:58 +00:00
Michael Wright
150e0e87e1 Merge "fix return value scale of notifyANR()" 2015-04-15 10:53:21 +00:00
Martijn Coenen
741e89121b am 1f440cb0: am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()." 
* commit '1f440cb0b8d2c84fd1bb2e06fcc94d86717f648a':
  Add getPrefixAids().
 2015-04-15 10:07:44 +00:00
Martijn Coenen
1f440cb0b8 am 895f3c27: am 6a47a861: Merge "Add getPrefixAids()." 
* commit '895f3c27269d14ec53ff3ae8526342f9b57a10e1':
  Add getPrefixAids().
 2015-04-15 09:51:52 +00:00
Martijn Coenen
895f3c2726 am 6a47a861: Merge "Add getPrefixAids()." 
* commit '6a47a86112e271d200f77d5ec66f5f50979135ca':
  Add getPrefixAids().
 2015-04-15 09:37:56 +00:00
Benjamin Franz
b4e2188321 Merge "Fix a SecurityException in setKeyguardEnabledState" 2015-04-15 08:29:15 +00:00
Martijn Coenen
6a47a86112 Merge "Add getPrefixAids()." 2015-04-15 08:00:13 +00:00
Martijn Coenen
ed3a29ea08 Add getPrefixAids(). 
Bug: 19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
 2015-04-15 09:48:57 +02:00
Chris Banes
5c1405e10c Merge "Unhide PopupWindow window layout type calls" 2015-04-15 07:05:51 +00:00
Erik Kline
8b66974758 Merge "multinetwork API: native implementation" 2015-04-15 06:50:25 +00:00
Jay Shrauner
d53f3634a3 Hide Voicemail APIs 
Bug:20162722
Change-Id: Ie405b077a9598f16ff19adfa09df3217f342cc1e
 2015-04-14 23:44:37 -07:00
Erik Kline
25f3b7bb2d multinetwork API: native implementation 
Bug: 19537384
Change-Id: I04f4a7de2b1e583989b67a853df6ab50289c2185
 2015-04-15 15:32:08 +09:00
Jay Shrauner
164a0acf53 Remove deprecated telecom APIs. Mark others final. 
Bug:
Change-Id: I8a04903052a964f3997b5bb36730b8b200c8e472
 2015-04-14 22:57:30 -07:00
Jae Seo
b744e47959 Merge "TIF: Add pixel aspect ratio to TvTrackInfo" 2015-04-15 05:51:18 +00:00
Daichi Hirono
52743f3b17 Merge "DocumentsUI: Use system cancel string resources." 2015-04-15 05:44:15 +00:00
Daichi Hirono
e4db58edd4 DocumentsUI: Use system cancel string resources. 
BUG=None

Change-Id: I989e28ad4729176d66b1b333f242470129d139fa
 2015-04-15 14:33:52 +09:00
Jim Miller
485a3cb2bc Merge "Several fixes to Fingerprint code after large merge - route fingerprint enrollment auth token - replace "processed" event with "authenticated" - fix type-o in strings.xml" 2015-04-15 05:25:24 +00:00
Jeff Sharkey
9f09b2d93f Merge "Persist nickname and flags for volumes." 2015-04-15 05:03:08 +00:00