Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,921 Commits 3 Branches 0 Tags
80b60bbb5efa42acef12843cde0d7a97f800337d
Commit Graph

195921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
80b60bbb5e Merge "Fix NPE when walking the set of packages to update app link policy" into mnc-dev 2015-06-24 19:45:29 +00:00
Makoto Onuki
0633ae7481 Merge "Actually wait for installd" into mnc-dev 2015-06-24 19:25:28 +00:00
Christopher Tate
af15d9e755 Fix NPE when walking the set of packages to update app link policy 
Bug 21851441

Change-Id: I3616c5a7e40f5ff9ad9bbfee579a4a2fb2b1f7fd
 2015-06-24 12:21:14 -07:00
John Spurlock
6b0f384f00 Merge "Volume Motion: Initial show and expand transition." into mnc-dev 2015-06-24 18:47:08 +00:00
Adam Lesinski
67f170993f Merge "Fix unit issue in Slog.wtf output" into mnc-dev 2015-06-24 18:45:54 +00:00
Adam Lesinski
7b3c7529c7 Fix unit issue in Slog.wtf output 
Bug:22063930
Change-Id: I02add66892eb32b1df7e845b8542beb928d2b3ca
 2015-06-24 11:42:49 -07:00
Alan Viverette
9bf9a3a99e Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 2015-06-24 18:22:33 +00:00
Todd Volkert
5f8e4675ae Remove unused PermissionsInfo class 
b/22008424

Change-Id: I53fc04af89c89cc1726dd80b05f2e18d5cc53524
 2015-06-24 11:10:37 -07:00
John Spurlock
22def3d4eb Volume Motion: Initial show and expand transition. 
Also re-enable the content collapse layout transition animations,
supported by ensuring the dialog window is tall enough for long
enough to complete the transition, avoiding clipping.

Bug: 21335976
Change-Id: Ibc4cbb1e882c1e11c4406463752afa177fb1e6d7
 2015-06-24 14:04:18 -04:00
Chris Craik
6659ac77ed Merge "Avoid over-damaging layer area for multidraws" into mnc-dev 2015-06-24 17:58:01 +00:00
Chris Wren
ccba036dd3 Merge "don't clear notification effects in response to peeks" into mnc-dev 2015-06-24 17:54:23 +00:00
Geoff Mendal
521db337f3 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-24 17:48:33 +00:00
Nancy Chen
8e0aab7dd5 Merge "Add public action to open voicemail settings." into mnc-dev 2015-06-24 17:37:45 +00:00
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
Geoff Mendal
1ee2070e99 Import translations. DO NOT MERGE 
Change-Id: Ifa40f7574852f801ed717c87cc9803a64dac5d78
Auto-generated-cl: translation import
 2015-06-24 10:30:01 -07:00
Alan Viverette
c98922ba2f Constrain FastScroller max width to be >= 0 
Bug: 22055552
Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9
 2015-06-24 10:22:02 -07:00
Chris Wren
1689594851 don't clear notification effects in response to peeks 
When the heads up appears it generates a visibility event for the panel.
This always clears the notification effects (buzz, beep, blink).
If we suppress that for heads up notifications, we never get another chance.
So we add a new call when we open the shade from the heads up to catch this case.

Bug: 20947591
Change-Id: I233e5346617ca2fce7851bd85154c838849df8f7
 2015-06-24 13:21:47 -04:00
Makoto Onuki
c8a2cfed01 Actually wait for installd 
Bug 19337445

Change-Id: I70bdaa0ac3695ac9d03ba34fe9d35fe775a5300d
 2015-06-24 09:52:58 -07:00
Chris Craik
3375f8ad30 Avoid over-damaging layer area for multidraws 
bug:19608961

Change-Id: Ib7495f155da62a352e9a010a362fd40ec0acad21
 2015-06-24 09:43:54 -07: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