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

196657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
ef024af420 am 2924dc34: Merge "Adding metrics to overview." into mnc-dev 
* commit '2924dc346654a22f72575eb8ae3ce2e714818bd2':
  Adding metrics to overview.
 2015-07-07 00:31:42 +00:00
Jean-Michel Trivi
87d3d8937f am 760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev 
* commit '760b1409bc865df5c60f637b8c994eb20888acb8':
  Ringtone: add support for volume control and looping
 2015-07-07 00:31:36 +00:00
Winson Chung
2924dc3466 Merge "Adding metrics to overview." into mnc-dev 2015-07-07 00:17:56 +00:00
Jean-Michel Trivi
760b1409bc Merge "Ringtone: add support for volume control and looping" into mnc-dev 2015-07-06 23:07:26 +00:00
Winson Chung
5c9f4b90bf Adding metrics to overview. 
Bug: 21528167
Change-Id: Ice1ce892682aa4599b9a689b47af373780897548
 2015-07-06 15:52:21 -07:00
Dianne Hackborn
d178b2da63 am 5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev 
* commit '5c8498db2111ea69566bc43a9e799d0447af789d':
  Add easy way to get device idle whitelist.
 2015-07-06 22:31:36 +00:00
Jorim Jaggi
e58857d7b1 am 28b4fc76: Merge "Don\'t prevent windows from drawing when they are just moving" into mnc-dev 
* commit '28b4fc76e2da7b93d9ba7ba75a7d0a512d9ff140':
  Don't prevent windows from drawing when they are just moving
 2015-07-06 22:31:31 +00:00
Alex Klyubin
b60903cda9 am b9e13a25: Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev 
* commit 'b9e13a25f39c53002787a89abdb599b952d96e21':
  Avoid IllegalStateException when generating/importing keys.
 2015-07-06 22:31:28 +00:00
David Friedman
4712c68f17 am 18b763bb: am 076d4f40: am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs 
* commit '18b763bb1ac6747754581e1c70b4f622e59cdfcc':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
 2015-07-06 22:31:24 +00:00
Casey Ho
766f3108e0 am becddea6: Merge "Unhide signal strength constants used by getLevel." into mnc-dev 
* commit 'becddea63e2c4b414e5eac2841d3516c4e89bb24':
  Unhide signal strength constants used by getLevel.
 2015-07-06 22:31:16 +00:00
Dianne Hackborn
5c8498db21 Merge "Add easy way to get device idle whitelist." into mnc-dev 2015-07-06 22:24:51 +00:00
Dianne Hackborn
1b13968707 Add easy way to get device idle whitelist. 
Change-Id: I28b0df69e7fb16b5d7542b1eae626bbfdd9a4c1c
 2015-07-06 15:13:37 -07:00
Etan Cohen
1bfabc7419 Merge changes from topic 'merge-dr1-063015' into mnc-dr-dev 
* changes:
  Added support for mid-call enabled SRVCC conference call
  MWI,phantom call,Suppl services, error codes
  Rename VoLTE/WFC enable API to available - add VT available API.
 2015-07-06 22:10:22 +00:00
Jorim Jaggi
28b4fc76e2 Merge "Don't prevent windows from drawing when they are just moving" into mnc-dev 2015-07-06 22:07:34 +00:00
Alex Klyubin
b9e13a25f3 Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev 2015-07-06 21:50:43 +00:00
David Friedman
18b763bb1a am 076d4f40: am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs 
* commit '076d4f40d849d1d1e628fa6b210e690020d04956':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
 2015-07-06 21:41:05 +00:00
Casey Ho
becddea63e Merge "Unhide signal strength constants used by getLevel." into mnc-dev 2015-07-06 21:39:31 +00:00
David Friedman
076d4f40d8 am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs 
* commit '7bd9b634c42b500466cf416566d27da229d6ca1c':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
 2015-07-06 21:27:05 +00:00
David Friedman
593904b1ab am f9fc53bb: am 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303. 
* commit 'f9fc53bb6f46ab89fb058c41d162b43ee9799314':
  Docs: Clarification of language and typo fix for work merged from CL 716303.
 2015-07-06 21:26:38 +00:00
David Friedman
7bd9b634c4 Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs 2015-07-06 21:15:07 +00:00
David Friedman
f9fc53bb6f am 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303. 
* commit '77b6971b4699bd94c9a4b044108f264f1ddfe31f':
  Docs: Clarification of language and typo fix for work merged from CL 716303.
 2015-07-06 21:13:19 +00:00
Jorim Jaggi
c5af4f8421 Don't prevent windows from drawing when they are just moving 
Bug: 21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb
 2015-07-06 21:12:49 +00:00
David Friedman
77b6971b46 am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303. 
* commit 'c66c7622eadb04c1ca258725ae7125626824c324':
  Docs: Clarification of language and typo fix for work merged from CL 716303.
 2015-07-06 20:56:51 +00:00
Chris Craik
e8dab95b1b am 74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev 
* commit '74fed612336fad30c8a93a346160ee36c87bd843':
  Clearer message when failing to draw a SW layer
 2015-07-06 20:39:15 +00:00
Chris Craik
74fed61233 Merge "Clearer message when failing to draw a SW layer" into mnc-dev 2015-07-06 20:29:57 +00:00
David Friedman
766b5b74c3 am f3a910b8: am 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs 
* commit 'f3a910b88dbb5235552752d0f3492410bca0ef59':
  docs: M Preview 2 - release notes
 2015-07-06 20:23:45 +00:00
David Friedman
f3a910b88d am 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs 
* commit '5977c4879b166eb1b5c0d6a7a361dde515e1d502':
  docs: M Preview 2 - release notes
 2015-07-06 20:09:11 +00:00
David Friedman
c66c7622ea Docs: Clarification of language and typo fix for work merged from CL 716303. 
Change-Id: I04f062696926b00ccfbd45fef368061dd968efbb
 2015-07-06 13:04:16 -07:00
David Friedman
5977c4879b am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs 
* commit '07661e3b73cee9720d79d0d09f7a60104ce4cabc':
  docs: M Preview 2 - release notes
 2015-07-06 19:53:11 +00:00
David Friedman
07661e3b73 Merge "docs: M Preview 2 - release notes" into mnc-preview-docs 2015-07-06 19:38:09 +00:00
Jim Miller
6f27127b7c am 79d9219c: Merge "Only allow fingerprint auth for the current user" into mnc-dev 
* commit '79d9219c9f9734025837a01a6f8e490d1e0ab57e':
  Only allow fingerprint auth for the current user
 2015-07-06 19:30:36 +00:00
Jim Miller
79d9219c9f Merge "Only allow fingerprint auth for the current user" into mnc-dev 2015-07-06 19:18:05 +00:00
David Friedman
ba5404c9d3 am 13c25290: am e7fb3318: am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs 
* commit '13c25290099a570fdd903511e7ec605119af3ce3':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707
 2015-07-06 18:59:16 +00:00
Andrew Solovay
d7e4e36914 am 8f8ad8bb: am b9e4e0d0: am afea7a99: docs: Updating permissions preview for Preview 2. 
* commit '8f8ad8bb570be173ac369b629e31ea283fe09cc5':
  docs: Updating permissions preview for Preview 2.
 2015-07-06 18:59:11 +00:00
David Friedman
13c2529009 am e7fb3318: am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs 
* commit 'e7fb33180d689bbdddae03ab0afe730e4d312f45':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707
 2015-07-06 18:43:37 +00:00
Andrew Solovay
8f8ad8bb57 am b9e4e0d0: am afea7a99: docs: Updating permissions preview for Preview 2. 
* commit 'b9e4e0d0f13ba40e95590f42c351af9b1dba0c5b':
  docs: Updating permissions preview for Preview 2.
 2015-07-06 18:43:31 +00:00
Jim Miller
cb7d9e9332 Only allow fingerprint auth for the current user 
This prevents fingerprint access from activities
for a user that isn't the current user.

Fixes bug 20223481

Change-Id: I360f90972fe63f5066f701a3efda355a7cb11338
 2015-07-06 11:38:52 -07:00
David Friedman
e7fb33180d am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs 
* commit 'b50a279fb68aace181787780187c9d3485c84f50':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707
 2015-07-06 18:29:11 +00:00
Andrew Solovay
b9e4e0d0f1 am afea7a99: docs: Updating permissions preview for Preview 2. 
* commit 'afea7a9982de194893cf1a789bc2625d192727c4':
  docs: Updating permissions preview for Preview 2.
 2015-07-06 18:29:06 +00:00
Shriram Ganesh
6bf35acd7c Added support for mid-call enabled SRVCC conference call 
When TelephonyConnection is created for an unknown connection,
the recalculation of conference participants have to be
retriggered. This is because, unless that TelephonyConnection is
added to ConnectionService, it cannot be added as part of a
conference call in CallsManager.

Change-Id: Ic9359104f02eddff655d84fd25f5c28c9158e5f4
 2015-07-06 11:28:19 -07:00
Shriram Ganesh
ddf570e822 MWI,phantom call,Suppl services, error codes 
1. IMS MWI Feature
- Add new API to update waiting
voice message count, for UI
propagation based on RFC 3842

2. phantom call support

Supplementary services

3. IMS : Incoming Call Barring
- Modified existing API to support
   request like registration,activation,
   deactivation,erasure,interogation.

4.Unsol supplementary service notification
- send unsol supplementary notification to UI
- add call history info

Miscellaneous
5. Ims: Originate conference call in DIALING state

6. IMS: Addition of Extras to ImsCallProfile
- Add EXTRA string definitions to ImsCallProfile

7. IMS: Definition of error code
- answered elsewhere
- FDN call failure

8.
- Propagate IMS supplementary services to telephony framework
- Introduce call forwarding history info.

Bug: 21725750
Squash of 2 earlier CLs:
         Change-Id: I52a64e9a5df3479189f62921a01655a50fb386fc
         Change-Id: Idc3a433785e84a3d683cbcfc7fb90f0b89dced12

Change-Id: I428ce3c6a043e43b86dea41622e0a828d8b45e53
 2015-07-06 11:28:19 -07:00
Etan Cohen
b304fc0aaf Rename VoLTE/WFC enable API to available - add VT available API. 
Renamed API to use consistent semantics: available refers to the current
state of the service rather then whether feature is enabled by device/carrier/
user.

Added VT API to match VoLTE/WFC.

Change-Id: Ifb31f123db77e731e75a982b8594168f59a289e7
 2015-07-06 11:28:18 -07:00
Alex Klyubin
b6e628644a Avoid IllegalStateException when generating/importing keys. 
This avoids IllegalStateException when generating/importing keys which
require user authentication when the system is not configured to
generate/import such keys (e.g., secure lock screen not set up).

The documentation states that before generating/importing such keys
apps should check (using public API) whether the system is in a
suitable state. However, some apps are not doing that and instead
catching the IllegalStateException thrown during key
generation/import. This is a bad practice because this exception is an
undocumented implementation detail and should thus not be depended
upon.

This CL addresses this issue as follows:
1. Key(Pair)Generator.init now throws a checked
   InvalidAlgorithmParameterException when the system is in a wrong
   state. Because in most uses of Key(Pair)Generator .init is
   immediately followed by .generate, this prevents .generate from
   encountering this state and does so using a checked exception
   which is part of public API.
2. Key import rethrows the IllegalStateException as a checked
   KeyStoreException which is meant to be thrown if the key cannot be
   imported for any reason. Key(Pair)Generator.generate unfortunately
   cannot throw any checked exceptions and thus has to continue
   throwing unchecked exceptions.

Bug: 22262809
Change-Id: Ic0f7b7a90e0ba63df9139c79b80a8649d2645d2a
 2015-07-06 11:27:16 -07:00
Raph Levien
abbe3136a3 am 441fc0fc: Merge "Fix problems with StaticLayout indentation" into mnc-dev 
* commit '441fc0fc68140368d5438a6eb5b896b4a9d6ad4e':
  Fix problems with StaticLayout indentation
 2015-07-06 18:20:55 +00:00
David Friedman
b50a279fb6 Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs 2015-07-06 18:20:38 +00:00
Adam Lesinski
948ac4facb am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 
* commit '1a257545b2d1e8bd95393ee6637e70be7d230bc6':
  BatteryStats: Fix issue with method parameter order...
 2015-07-06 18:12:51 +00:00
Jeff Sharkey
7dfe0f8317 am 7fd3c296: Merge "Permission to view shared storage for all users." into mnc-dev 
* commit '7fd3c296f1991e321e4c69a5e7f918cc3d252625':
  Permission to view shared storage for all users.
 2015-07-06 18:12:46 +00:00
Jeff Sharkey
e6130b6c50 am 6d842f63: Merge "Fix DocumentsUI animation regression." into mnc-dev 
* commit '6d842f63a00e34edb583f9fdd6f233c20dcd00f2':
  Fix DocumentsUI animation regression.
 2015-07-06 18:12:41 +00:00
Jeff Sharkey
d58ddd82f0 am 246d6984: Merge "Handle missing migration source volume." into mnc-dev 
* commit '246d69849951e4dbc0726a7faa58ecb71f7cf460':
  Handle missing migration source volume.
 2015-07-06 18:12:36 +00:00
Jeff Sharkey
d19555d92c am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev 
* commit '38cae6c8bcb86236b21d69f852473351c0c1d82a':
  Reconcile private volumes when mounted.
 2015-07-06 18:12:32 +00:00