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

209382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
9069fab8bc Changes to update APN db via Gservices and ConfigUpdater. 
- Adding settings that are updated by Gservices.
- Changes to handle UPDATE_APN_DB intent.
- UPDATE_APN_DB intent triggers update of apns-conf.xml and carriers db.

Change-Id: I65a63f3015da1b827b974d17e48bee4c747544ff
 2015-07-28 23:22:10 +00:00
Todd Kennedy
4c423351c0 am b91bf1f3: am 673fed99: am f2c616ed: Merge "Partially revert package freezing" into mnc-dev 
* commit 'b91bf1f3ced1692b30bd731e6f5555a69ad63d72':
  Partially revert package freezing
 2015-07-28 23:20:15 +00:00
Jorim Jaggi
353fe1c665 am 0d210f63: Animation for touch, wake and unlock 
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock
 2015-07-28 23:19:39 +00:00
Chris Tate
403e22b97d am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev 
* commit '751a96a040ada09199ca3356d9a515ec090d1237':
  Don't redundantly call transport.finishRestore()
 2015-07-28 23:19:34 +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
bd388372a8 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:11 +00:00
Todd Kennedy
b91bf1f3ce am 673fed99: am f2c616ed: Merge "Partially revert package freezing" into mnc-dev 
* commit '673fed99b931ce0efc17b0e549e7842e4775154c':
  Partially revert package freezing
 2015-07-28 22:58:03 +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
673fed99b9 am f2c616ed: Merge "Partially revert package freezing" into mnc-dev 
* commit 'f2c616ed02aee3b9a9025caf288aadbf22cfd046':
  Partially revert package freezing
 2015-07-28 22:37:28 +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
Abodunrinwa Toki
807005a7f8 Merge "Demo functional test for frameworks/core with Espresso" 2015-07-28 22:06:27 +00:00
Tyler Gunn
a66167414a am 83290135: am 8d74abb5: am 444185e8: am 3d83e744: am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev 
* commit '832901356015eb08836c1688ec3ba96efb4e4a11':
  Add "Call subject" capability to phone accounts.
 2015-07-28 21:54:58 +00:00
Abodunrinwa Toki
223c8392f0 Demo functional test for frameworks/core with Espresso 
- Integrates Espresso
- Changes the Instrumentation Test runner to AndroidJUnitRunner
- Adds a demo test

This will serve as a template for other tests.

Change-Id: I10592f5adb404c2aba9dd8676ae2aa5a191ad336
 2015-07-28 21:46:51 +00:00
Jeff Sharkey
4634987668 Give secondary users read-only physical cards. 
Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.

More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.

This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users.  Other users remain able to read content elsewhere
on the card.

Bug: 22787184
Change-Id: Ied8c98995fec1b7b50ff7d930550feabb4398582
 2015-07-28 14:42:34 -07:00
Tyler Gunn
8329013560 am 8d74abb5: am 444185e8: am 3d83e744: am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev 
* commit '8d74abb5bb5cf479f97b26ca8328766dbd6a4257':
  Add "Call subject" capability to phone accounts.
 2015-07-28 21:36:58 +00:00
Dianne Hackborn
6105a30d9d am 0091e2c0: am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '0091e2c03d1f2d212c94a3096e86407c78df6820':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 21:26:50 +00:00
Jorim Jaggi
786158dd39 am f0d42a9f: am 048995f4: am eb80a86d: am 359f1e91: am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev 
* commit 'f0d42a9fcaa2946dc729b8a2cf34aca6abc20c12':
  Don't use screenshot if structure is disabled (1/2)
 2015-07-28 21:26:40 +00:00
Robert Greenwalt
6a35968cf8 am 691b8104: am f99b6f28: am 872d264c: am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit '691b81042f0d443dc16d82426c043d4a3f76378a':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 21:26:33 +00:00
Tyler Gunn
8d74abb5bb am 444185e8: am 3d83e744: am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev 
* commit '444185e881a3c7d449478e20199b76f5d2bd452d':
  Add "Call subject" capability to phone accounts.
 2015-07-28 21:15:53 +00: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
Dianne Hackborn
0091e2c03d am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '639fd0e9d8ecb59f8d15b3f1e5ec7a6ae6cc3161':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 21:03:15 +00:00
Jorim Jaggi
f0d42a9fca am 048995f4: am eb80a86d: am 359f1e91: am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev 
* commit '048995f403589ac71b440c18a81082ff26b2287d':
  Don't use screenshot if structure is disabled (1/2)
 2015-07-28 21:03:10 +00:00
Robert Greenwalt
691b81042f am f99b6f28: am 872d264c: am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit 'f99b6f2886cde0406798f0b8b4b1666c29b387bf':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 21:03:04 +00:00
Tyler Gunn
444185e881 am 3d83e744: am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev 
* commit '3d83e74449acdf8195e0a4f7f82ad79fb3f891dd':
  Add "Call subject" capability to phone accounts.
 2015-07-28 20:53:16 +00: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
Dianne Hackborn
639fd0e9d8 am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '025a5dc6decf2bd93e21640651b485f6420dbbfe':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 20:43:57 +00:00
Jorim Jaggi
048995f403 am eb80a86d: am 359f1e91: am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev 
* commit 'eb80a86df01629296bab48609493882a31b091f9':
  Don't use screenshot if structure is disabled (1/2)
 2015-07-28 20:43:50 +00:00
Robert Greenwalt
f99b6f2886 am 872d264c: am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit '872d264c0a19ea0db078509edb17bd125ff5449d':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 20:43:41 +00:00
Tyler Gunn
3d83e74449 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:31:05 +00:00
Dianne Hackborn
025a5dc6de am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '108f5493edb50201d3dd2ba32a19db93edad8800':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 20:22:50 +00:00
Jorim Jaggi
eb80a86df0 am 359f1e91: am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev 
* commit '359f1e91e5715644b0da4f01e58c994a9e4598aa':
  Don't use screenshot if structure is disabled (1/2)
 2015-07-28 20:22:46 +00:00
Robert Greenwalt
872d264c0a am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit 'd6162cf244eab3a3c77a011ffe75dd04a787b951':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 20:22:41 +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
108f5493ed 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:57:40 +00:00
Jorim Jaggi
359f1e91e5 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:57:35 +00:00
Robert Greenwalt
d6162cf244 am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit 'b3c93c5f4256a1da1a8020abe5812a841b67667a':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 19:57:31 +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
Jason Monk
3358d91dd1 am 11c410b7: am 396da07e: am 6c9001fc: am 52fbf583: am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '11c410b7199c1776f336a4400e92258446837f72':
  Fix network name not showing in QS sometimes
 2015-07-28 19:48:31 +00:00
Robert Greenwalt
b3c93c5f42 Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 2015-07-28 19:39:48 +00:00
Jason Monk
11c410b719 am 396da07e: am 6c9001fc: am 52fbf583: am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '396da07e7992f8a5877162d40ba02dd0e0987fc4':
  Fix network name not showing in QS sometimes
 2015-07-28 19:27:12 +00:00
Jason Monk
396da07e79 am 6c9001fc: am 52fbf583: am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '6c9001fc28ea0abbfe95ef7aec1cdcd7192cd963':
  Fix network name not showing in QS sometimes
 2015-07-28 19:06:23 +00:00
Alex Klyubin
e4928a2912 Keymaster digest/padding NONE no longer means ANY. 
This adjusts the public API documentation to no longer say that
digest/padding NONE means any digest/padding. This also changes the
implementation of legacy key generation and import to explicitly
list which digests/paddings the generated/imported key is authorized
for. Previously, such keys were simply authorized for digest NONE and
padding NONE.

Bug: 22556114
Change-Id: Id02d9450a07de16ccb795b76b6de0006dd49dcca
 2015-07-28 13:00:56 -06:00
Tyler Gunn
c4fe26eb46 am 91aa02f2: am baca9e1e: am 0be28a7f: am c5c7987f: Merge "Add child_address call extra." into mnc-dr-dev 
* commit '91aa02f2478699869de03d2cfa51b3ef6d1202d6':
  Add child_address call extra.
 2015-07-28 18:49:26 +00:00
Adam Lesinski
a3849e82d8 am fc9a0276: am 29f8e978: am 6548f9b8: am 3209e18c: am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev 
* commit 'fc9a0276c4111b302c0e680b4fe457fa9b10b246':
  BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf
 2015-07-28 18:48:14 +00:00
Lorenzo Colitti
98140ecef0 am 2ae3a05b: am b0014e9f: am 08ef66bb: am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* commit '2ae3a05b424f7ef7c3a28507e2c19fde7f1e5963':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 18:48:06 +00:00
Filip Gruszczynski
ad3ee36e7f am 5441a7b3: am 764707f0: am 1bf3d222: Merge "Don\'t animate burn-in return when it wasn\'t applied." into cw-e-dev 
* commit '5441a7b3c232a90be1326dabfadd5a222e2bc268':
  Don't animate burn-in return when it wasn't applied.
 2015-07-28 18:47:49 +00:00