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

195902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
c8cedd5311 Merge "InCallService meta-data [2/4]" into mnc-dev 2015-06-24 17:37:13 +00:00
Santos Cordon
b6acf517ff Merge "Additional javadoc." into mnc-dev 2015-06-24 17:36:58 +00:00
Esteban Talavera
e4ffec210e Merge "Reset permission policy to default when device owner goes away" into mnc-dev 2015-06-24 16:42:36 +00:00
Esteban Talavera
28b9570d02 Reset permission policy to default when device owner goes away 
Otherwise after the Device Owner is gone, runtime
permissions might still be auto granted/denied.
I understand that there are many other policies that
we don't reset after the device/profile owner goes
away (e.g. keyguard enabled/disabled). At least now
we have a single method when we could clear the
ones that we care about.

Bug: 21889278
Change-Id: I6997655e6ef6d474bd25ae1c323eca5b17944b16
 2015-06-24 17:19:19 +01:00
Michael Wright
5edd0e06d5 Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 2015-06-24 16:12:22 +00:00
Luan Nguyen
838a29a659 am c1b4b058: am c5a480d1: am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs 
* commit 'c1b4b0580ccdbccee25f4bc97e94530e4982e1f7':
  docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
 2015-06-24 15:29:47 +00:00
Luan Nguyen
c1b4b0580c am c5a480d1: am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs 
* commit 'c5a480d112f6ce8645d9e294c42b2baab3b56ab9':
  docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
 2015-06-24 15:16:57 +00:00
Luan Nguyen
c5a480d112 am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs 
* commit 'fdad629fc089783fa0b3caad62ba99a9083f8645':
  docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
 2015-06-24 15:05:13 +00:00
Tom Hudson
a81a0c8647 Merge "Sync canvas proxy CTM (b/21945972)" into mnc-dev 2015-06-24 14:53:58 +00:00
Luan Nguyen
fdad629fc0 am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs 
* commit '6859a9f09049d1dc760b98a6cbb278b591de63a6':
  docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
 2015-06-24 14:51:30 +00:00
Luan Nguyen
6859a9f090 Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs 2015-06-24 14:43:31 +00:00
Tom Hudson
90fb1f6732 Sync canvas proxy CTM (b/21945972) 
SkiaCanvasProxy was being created with an identity transform, ignoring
any transform that may have been applied in Java (or C++) to the
android graphics Canvas it was proxy for. This CL makes sure the
DisplayListCanvas transform is propagated to the Proxy every time
asSkCanvas() is called.

We could instead move the code to the SkiaCanvasProxy constructor
if we got rid of the cached proxy on DisplayListCanvas; nobody's
using the proxy heavily enough that that should be a performance
hit at this time.

BUG:21945972
R=djsollen@google.com

Change-Id: I99ed1563802a2449bb9939cb67976cd60dd8611c
 2015-06-24 10:43:16 -04:00
Geoff Mendal
e042f952b3 Import translations. DO NOT MERGE 
Change-Id: I23e3d5c71af8db285d657cf5dafbebc5c4bbad6b
Auto-generated-cl: translation import
 2015-06-24 08:58:21 -05:00
Andrei Stingaceanu
2e5615467e Merge "Floating toolbar shown after rotation in extract mode" into mnc-dev 2015-06-24 09:16:36 +00:00
Lorenzo Colitti
9ce8a9da40 Use heads-up notifications when selecting networks with no Internet 
Currently, when connecting to a network that has a captive portal
or has no Internet access, we display a regular notification.
Because this notification is easy to miss, switch to using a
heads-up notification if the user just manually selected the
network. If the system connects automatically, continue to use a
regular notification.

Bug: 20081183
Change-Id: I7a988b2bddfe898a0d2607ad85a04b227d678469
 2015-06-24 17:47:44 +09:00
Lorenzo Colitti
ddfe5d573e Merge "Fix build." into mnc-dev 2015-06-24 05:39:42 +00:00
Lorenzo Colitti
606d311b9a Fix build. 
Per comments in http://ag/704632 , purgeResources was intended to
be hidden.

Bug: 18386420
Change-Id: Iced006878f86c6b7b15dd38f5e704a2f97aeeda5
 2015-06-24 14:37:29 +09:00
Daniel Sandler
0ec462005d Fix build. 
We don't need purgeResources public since it's part of the
ashmem internal optimization.

Change-Id: I65ba7545cf4801a8b97f3ece9b5ee5100c0f1c97
 2015-06-24 01:27:05 -04:00
Jae Seo
1d3e3ca157 Merge "TIF: Use per-user ContentResolver in the TvInputManagerService" into mnc-dev 2015-06-24 04:53:08 +00:00
Brian Carlstrom
45ab734a7a Merge "Add missing NULL check for android_os_Parcel_writeInt" into mnc-dev 2015-06-24 04:36:13 +00:00
Jae Seo
8c375feb68 TIF: Use per-user ContentResolver in the TvInputManagerService 
When switched to a different user (e.g. Restricted profile), the
TvInputManagerService continues to use the TV storage of the previous
user for logging, resulting in failure of the FOREIGN KEY constraint
since channel data for the current user don’t match to the logging data.
This change ensures that the system service uses the proper
ContentResolver when the user is switched.

Bug: 22047202
Change-Id: I870b5bd921e37a5f1219ea66c7a51314c77ddb01
 2015-06-23 20:50:21 -07:00
Svetoslav
df499d5d3b Merge "Update the storage permission group icon" into mnc-dev 2015-06-24 02:20:07 +00:00
Svetoslav
41181ca3e7 Update the storage permission group icon 
bug:21730509

Change-Id: I2ea2d99febac0e57a3ad3e2fc35f629ed0d2f9ec
 2015-06-23 19:18:55 -07:00
Dan Sandler
346872d538 Merge "Allow an icon to carry a tint with it, wherever it goes." into mnc-dev 2015-06-24 02:10:25 +00:00
Daniel Sandler
25a5f30128 Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 2015-06-24 02:09:58 +00:00
Simranjit Singh Kohli
29124960c6 Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev 2015-06-24 01:24:45 +00:00
Brian Carlstrom
849ea02682 Add missing NULL check for android_os_Parcel_writeInt 
All other usages of nativePtr were already checked.

Bug: 21636519
Change-Id: Icc09ce4326e6b05c5a248cc4de84ae231d5690b1
 2015-06-23 18:02:12 -07:00
Svetoslav
c5e43c508f Only current IME and spell checker can access user dictionary 
Change-Id: I6c5716d4d6ea9d5f55a71b6268d34f4faa3ac043
 2015-06-24 00:56:44 +00:00
Ricardo Garcia
2eab06c38f Merge "Fix for SafeMedia logic and CTS tests" into mnc-dev 2015-06-24 00:24:44 +00:00
Chris Craik
c686757a18 Merge "Unify clipping return value behavior - true if not empty" into mnc-dev 2015-06-24 00:12:51 +00:00
Bryce Lee
aef3698f9a Merge "resolved conflicts for merge of 91d2cbf4 to mnc-dev" into mnc-dev 2015-06-24 00:07:54 +00:00
Bryce Lee
d389684bea resolved conflicts for merge of 91d2cbf4 to mnc-dev 
Change-Id: I1c7e2999483a7959630844ecd20f5f37b7896aae
 2015-06-23 17:06:51 -07:00
Makoto Onuki
d1e62d9dfd Merge "Remove default activity title to prevent talkback from..." into mnc-dev 2015-06-24 00:04:43 +00:00
Makoto Onuki
9feac1425c Remove default activity title to prevent talkback from... 
reading the wrong title.

We get a title from DocumentProvider with an async task, and by the time we
get it, it's *usually* too late and talkback end up reading the default title.

Bug 20041072

Change-Id: I7686fe4ae4c157ebfc07bd8b895c4cfdf99c057a
 2015-06-23 16:51:45 -07:00
Alan Viverette
b1825feac0 Merge "Throw IAE on invalid measure spec size" into mnc-dev 2015-06-23 23:41:03 +00:00
Dianne Hackborn
fcaed60650 Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 23:34:22 +00:00
Ruben Brunk
a39fcc5875 Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev 2015-06-23 23:33:22 +00:00
Sharvil Nanavati
8a0fd13081 Merge "resolved conflicts for merge of 64a4858b to mnc-dev" into mnc-dev 2015-06-23 23:24:10 +00:00
Alan Viverette
ac6cfb32fe Throw IAE on invalid measure spec size 
Crash immediately so that we can track down the cause. If we let it
through, we'll hit an ISE later in dispatchVsync() and never know why.

Bug: 21948478
Change-Id: I84edf93cdf09d755419e18a7606b7b6cbd059956
 2015-06-23 16:23:49 -07:00
Sharvil Nanavati
e7908c7ff2 resolved conflicts for merge of 64a4858b to mnc-dev 
Change-Id: I9340b816232285853740c03d5e9898fdd019ff0e
 2015-06-23 16:23:06 -07:00
Ruben Brunk
b8f4c6ab1e Update DngCreator to handle pre-correction dimens. 
Bug: 20491394
Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
 2015-06-23 16:23:03 -07:00
Doris Liu
0ab731340b Merge "Add enter/exit animation for window provided CAB" into mnc-dev 2015-06-23 23:20:02 +00:00
Doris Liu
169f87a04b Add enter/exit animation for window provided CAB 
Bug: 21886856
Change-Id: I6b20901c51ce7d74058f6ef866334f622a1fa3a4
 2015-06-23 16:11:07 -07:00
Bryce Lee
91d2cbf447 am 65dca454: Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev 
* commit '65dca454c7a717b001b51d0089e7565ba428ce87':
  Turn off theater mode upon power button press.
 2015-06-23 23:04:26 +00:00
Svetoslav Ganov
2c99ea3524 Merge "Remove not needed contacts related permissions." into mnc-dev 2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions. 
This reverts commit ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
 2015-06-23 23:03:55 +00:00
Ricardo Garcia
3a30a76e88 Fix for SafeMedia logic and CTS tests 
Added audio.safemedia.bypass system property to bypass SafeMedia logic on
CTS tests which require guaranteed access to full range of volume levels.

bug: 21779099
Change-Id: I76815a995f08d426218206af7aade491c5debd9e
 2015-06-23 15:54:45 -07:00
Chris Craik
5ec6a2878b Unify clipping return value behavior - true if not empty 
bug:22035484

Change-Id: I23ecca38554a60c590181290900deb0e2c48cea1
 2015-06-23 15:42:43 -07:00
Zach Johnson
12402dafea Merge "Update CarrierService long lived binding API" into mnc-dev 2015-06-23 22:19:25 +00:00
Santos Cordon
f2600eb5ac InCallService meta-data [2/4] 
Bug: 21816241

Change-Id: I9af91a1287f652247ef590878759aa277bd925e5
 2015-06-23 15:13:39 -07:00