Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,686 Commits 3 Branches 0 Tags
da0b2ce39ccc0eb2042cf601ff89883f67b4fa10
Commit Graph

203686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ronghua Wu
da0b2ce39c am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 
* commit '02022b70bef7d6964bc8043385531d1aa97fb15b':
  media: fix estimateFrameRatesFor to use correct ratio
 2015-07-29 01:02:01 +00:00
Dianne Hackborn
37cf391caf am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev 
* commit 'b310c8945330a0a94abae34451e0bdc227f52035':
  Fix issue #22802691: APR: NPE in ActivityRecord
 2015-07-29 01:01:54 +00:00
Dianne Hackborn
cf887f5c91 am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev 
* commit '5b009d523c6ad89f946e4a19f3fdba3c63bcf1f5':
  Fix issue #22802617: APR: spurious wtf when restarting a persistent process
 2015-07-29 01:01:46 +00:00
Dianne Hackborn
9d3a0efaef am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 
* commit 'b492ced89eaf38b2b9962dbfae2435dd242abf19':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
 2015-07-29 01:01:36 +00:00
Ronghua Wu
02022b70be Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 2015-07-29 00:53:12 +00:00
Dianne Hackborn
b310c89453 Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev 2015-07-29 00:47:33 +00:00
Dianne Hackborn
5b009d523c Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev 2015-07-29 00:46:20 +00:00
Dianne Hackborn
b492ced89e Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 2015-07-29 00:45:18 +00:00
Adam Lesinski
9466fa27b1 am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit 'c96e6f19937ac36c8147a52863a43b35895aeb0b':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 00:44:05 +00:00
Jason Monk
139dabcc42 am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev 
* commit 'fbcbad138d1b4c55e86ff671821b4feb7fc48f50':
  Add sizes to SysUI tests
 2015-07-29 00:43:59 +00:00
Aravind Akella
4633f37107 am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev 
* commit '15938235d25a879ebb000cb3671fd75cb092e981':
  Call getInstanceForPackage instead of creating a new SensorManager instance.
 2015-07-29 00:43:52 +00:00
Dianne Hackborn
b795d7c4a3 Fix issue #22802691: APR: NPE in ActivityRecord 
Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da
 2015-07-28 17:40:06 -07:00
Adam Lesinski
c96e6f1993 Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 2015-07-29 00:34:38 +00:00
Jason Monk
fbcbad138d Merge "Add sizes to SysUI tests" into mnc-dev 2015-07-29 00:31:16 +00:00
Dianne Hackborn
9dc6c61a80 Fix issue #22802782: APR: NPE in package manager with bad intent data 
If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.

Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
 2015-07-28 17:30:59 -07:00
Dianne Hackborn
a73b68fb85 Fix issue #22802617: APR: spurious wtf when restarting a persistent process 
Just don't do a wtf here, it isn't really wrong (though it isn't really
right, but at this point in a release it is right enough!).

Change-Id: Ic38a2e27556224cf8868f1fa18b4810929d67fcc
 2015-07-28 17:22:46 -07:00
Aravind Akella
15938235d2 Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev 2015-07-29 00:21:18 +00:00
Adam Lesinski
c691d3ccf4 BatteryStats: Use proper power calculator when energy data is received 
We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.

We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.

Bug:22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
 2015-07-28 17:11:29 -07:00
Jorim Jaggi
66c3fc3854 am 0d210f63: Animation for touch, wake and unlock 
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock
 2015-07-28 23:22:59 +00:00
Chris Tate
36d5edff87 am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev 
* commit '751a96a040ada09199ca3356d9a515ec090d1237':
  Don't redundantly call transport.finishRestore()
 2015-07-28 23:22:53 +00:00
Jorim Jaggi
0d210f6395 Animation for touch, wake and unlock 
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
  First, start with a black scrim on top of everything, and then fade
  it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
  in the same manner as the scrim.

Bug: 22571198
Bug: 21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
 2015-07-28 23:02:54 +00:00
Zach Johnson
6b026e3173 am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit '5faa033615dcb4297fcb6a81828099285364942d':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 22:58:07 +00:00
Chris Tate
751a96a040 Merge "Don't redundantly call transport.finishRestore()" into mnc-dev 2015-07-28 22:56:41 +00:00
Todd Kennedy
beef2b78ad am f2c616ed: Merge "Partially revert package freezing" into mnc-dev 
* commit 'f2c616ed02aee3b9a9025caf288aadbf22cfd046':
  Partially revert package freezing
 2015-07-28 22:38:04 +00:00
Zach Johnson
5faa033615 Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 2015-07-28 22:36:30 +00:00
Todd Kennedy
f2c616ed02 Merge "Partially revert package freezing" into mnc-dev 2015-07-28 22:15:43 +00:00
Ronghua Wu
4ef977c08f media: fix estimateFrameRatesFor to use correct ratio 
Bug: 22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
 2015-07-28 15:08:08 -07:00
Christopher Tate
6ab2fb61f0 Don't redundantly call transport.finishRestore() 
The RestoreSession is no longer responsible for calling finishRestore();
that happens as part of tidying up after running the restore itself,
even in failure cases.

Bug 22640096

Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522
 2015-07-28 14:04:04 -07:00
Todd Kennedy
6b0c8315e4 Partially revert package freezing 
On the Nexus Player, upgrading the launcher would cause multiple, simultaneous
processes to be running. In order to prevent this regression, revert the portion
of ag/682591 dealing with package upgrades.

Bug: 21123444
Change-Id: I7a4cf98c7e28fc9893b1c0358d3a98702d94c039
 2015-07-28 13:52:49 -07:00
Tyler Gunn
11f2dbf7ef am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev 
* commit 'bdbec480e8598bd959a2fc047cfad8b72c8a645b':
  Add "Call subject" capability to phone accounts.
 2015-07-28 20:32:07 +00:00
Tyler Gunn
bdbec480e8 Merge "Add "Call subject" capability to phone accounts." into mnc-dev 2015-07-28 20:07:40 +00:00
Dianne Hackborn
8b679bfa36 am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '3551a59b277fd4dc924f48116c153a50fb0913eb':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 19:58:52 +00:00
Jorim Jaggi
69aa584f4e am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev 
* commit '850dd6907f87782474d4bc128c8c0137a9cc85fc':
  Don't use screenshot if structure is disabled (1/2)
 2015-07-28 19:58:45 +00:00
Robert Greenwalt
1bf3bec726 am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit 'b3c93c5f4256a1da1a8020abe5812a841b67667a':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 19:58:36 +00:00
Dianne Hackborn
3551a59b27 Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 2015-07-28 19:52:53 +00:00
Dianne Hackborn
57dd737443 Work on issue #21516866: Implement voice interaction in ResolverActivity 
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.

This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.

Also added some debug help, having activity print the state of the
voice interactor.

Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
 2015-07-28 12:52:11 -07:00
Jorim Jaggi
850dd6907f Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev 2015-07-28 19:49:44 +00:00
Robert Greenwalt
b3c93c5f42 Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 2015-07-28 19:39:48 +00:00
Robert Greenwalt
a36c074052 Un-remove legacy ConnectivityManager API. 
These were @removed too soon.  We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.

bug:22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
 2015-07-28 11:41:31 -07:00
Jason Monk
e6e2c10860 am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '350662197542d406df58aa65afddc9e23f9309d3':
  Fix network name not showing in QS sometimes
 2015-07-28 18:22:45 +00:00
Jason Monk
3506621975 Merge "Fix network name not showing in QS sometimes" into mnc-dev 2015-07-28 18:05:49 +00:00
Jason Monk
e427cb8076 Add sizes to SysUI tests 
Change-Id: I27e4a60e2658d3a5db32cdeb73bd0a031865ce86
 2015-07-28 10:06:01 -04:00
Adam Lesinski
88b6547898 am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev 
* commit '602611375b11805f74ae52f5d62a944c74f967d6':
  BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
 2015-07-28 01:21:44 +00:00
Lorenzo Colitti
8f4787e615 am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* commit 'e288b3af14421731d8f477b97e8d77588f20498b':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 01:21:36 +00:00
Adam Lesinski
602611375b Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev 2015-07-28 01:06:14 +00:00
Lorenzo Colitti
e288b3af14 Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* changes:
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 01:03:44 +00:00
Jorim Jaggi
ad780f3330 am 965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev 
* commit '965bab2bae4198deaa929c8f36e44c561fb2c72c':
  Allow assist gesture when notification shade is expanded
 2015-07-28 00:53:14 +00:00
Jorim Jaggi
1dfa7c6c79 Don't use screenshot if structure is disabled (1/2) 
Bug: 22674955
Change-Id: I694bb8dbb578da9d729414c7f2947ba4c15651e3
 2015-07-27 17:49:00 -07:00
Jorim Jaggi
965bab2bae Merge "Allow assist gesture when notification shade is expanded" into mnc-dev 2015-07-28 00:36:14 +00:00
Mady Mellor
506424fc99 am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev 
* commit 'beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49':
  Allow text selection handles to scroll horizontally
 2015-07-28 00:36:07 +00:00