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

197732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nancy Chen
ce9fea390c am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev 
* commit '660322d8259cb256745f15219af0b9004063ea8d':
  Add transcription field to voicemail object and related changes.
 2015-07-17 16:50:52 +00:00
Nancy Chen
660322d825 Merge "Add transcription field to voicemail object and related changes." into mnc-dev 2015-07-17 16:37:43 +00:00
Julia Reynolds
3337693c78 am 593aca12: Merge "Support 24 clock displays in demo mode." into mnc-dev 
* commit '593aca12c2f7bf39ca8d4ae944f36a88bd4a48cf':
  Support 24 clock displays in demo mode.
 2015-07-17 16:01:55 +00:00
Julia Reynolds
593aca12c2 Merge "Support 24 clock displays in demo mode." into mnc-dev 2015-07-17 15:54:10 +00:00
Todd Kennedy
8c47b335b0 am 5fe22e4f: Merge "clear calling identity to dexopt" into mnc-dev 
* commit '5fe22e4fcbc543aa588d739b2453b3fa72d31859':
  clear calling identity to dexopt
 2015-07-17 14:49:34 +00:00
Todd Kennedy
5fe22e4fcb Merge "clear calling identity to dexopt" into mnc-dev 2015-07-17 14:40:00 +00:00
Lajos Molnar
9628568a22 am e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 
* commit 'e6b407b4be0b9c8240d34259b14e324da4d6832b':
  MediaSync: fix flush handling and deadlock
 2015-07-17 13:36:20 +00:00
Lajos Molnar
e6b407b4be Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 2015-07-17 13:24:27 +00:00
Dirk Dougherty
092445e518 am 9349093c: am 86917496: am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs 
* commit '9349093cd984523a9d4bab397cd092b33c04f27e':
  Doc change: Update AFW behavior changes for Preview 2.
 2015-07-17 03:40:50 +00:00
Dirk Dougherty
9349093cd9 am 86917496: am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs 
* commit '869174967f0efd011b503af5cc3445608667d81d':
  Doc change: Update AFW behavior changes for Preview 2.
 2015-07-17 03:27:42 +00:00
Dirk Dougherty
869174967f am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs 
* commit 'a758133566e030275988fb3bf253a432e6803d8f':
  Doc change: Update AFW behavior changes for Preview 2.
 2015-07-17 03:14:44 +00:00
Dirk Dougherty
a758133566 Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs 2015-07-17 02:58:40 +00:00
Selim Cinek
928b2bf7ae am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 
* commit 'b43b06d1056031444596edcc27a1a10084e5cad3':
  Fixed a bug where notifications were not posted on secondary users
 2015-07-17 01:40:06 +00:00
Selim Cinek
2a10ff0893 am 60e15dae: Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev 
* commit '60e15dae5aac3ea7529c13981ad339a8312e2fb2':
  Fixed a bug where a fingerprint animation was not running
 2015-07-17 01:40:01 +00:00
Nancy Chen
5bd3e73a21 Add transcription field to voicemail object and related changes. 
Bug: 22542002
Change-Id: I05c18e8f82a4f318fb59228e4d6eb844d64bee30
 2015-07-16 18:36:58 -07:00
Selim Cinek
b43b06d105 Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 2015-07-17 01:31:31 +00:00
Selim Cinek
60e15dae5a Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev 2015-07-17 01:29:29 +00:00
Jae Seo
25cb2b99e6 am d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev 
* commit 'd19ed4c16d0c11bb68dd3a7aab0fb1845814dac8':
  TIF: Avoid generating locale dependent input IDs
 2015-07-17 01:09:52 +00:00
Dan Sandler
8f895de9f4 am 86647987: Icon-related Notifications API changes: 
* commit '86647987c3c6bf4e6a8bacd763ff16f1806c70a3':
  Icon-related Notifications API changes:
 2015-07-17 01:09:48 +00:00
Jae Seo
d19ed4c16d Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev 2015-07-17 01:07:03 +00:00
Dan Sandler
86647987c3 Icon-related Notifications API changes: 
- Deprecate Notification.icon and largeIcon.
    setSmallIcon(Icon) and setLargeIcon(Icon) should be used
    instead.
  - Add Icon support to Notification actions; deprecate
    Action.icon and methods/ctors that use int.

Bug: 21310773
Bug: 21271587
Change-Id: Iddac8121e7690e9d7a0360edb488ab77e3e8fb3a
 2015-07-17 00:59:20 +00:00
Adrian Roos
6893aeee48 am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev 
* commit '5536bb48b2829f04f9a8258bfe698e5e4a26f234':
  Fix stuck scrim on keyguard-less devices
 2015-07-17 00:56:20 +00:00
Jae Seo
2ac1fd3c9d TIF: Avoid generating locale dependent input IDs 
Bug: 22519551
Change-Id: Id818f075fa4863b6e1a6f707e0debe8f08973f25
 2015-07-16 17:48:55 -07:00
Adrian Roos
5536bb48b2 Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev 2015-07-17 00:43:18 +00:00
Adam Powell
2fca481233 am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '9ba039bbe9478c56ae3875a9933d3ba754367dc2':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 00:32:58 +00:00
Adam Powell
9ba039bbe9 Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 2015-07-17 00:25:11 +00:00
Selim Cinek
f33b11182a Fixed a bug where notifications were not posted on secondary users 
Unfortunately they made sound though, driving people crazy.

Bug: 22351758
Change-Id: I9ec5bac97c2d587c4e356ab759876def3369b11a
 2015-07-16 17:24:51 -07:00
Selim Cinek
e8bae6288b Fixed a bug where a fingerprint animation was not running 
Previously the fingerprint animation would not run
when we successfully unlocked with the fingerprint,
because we were checking for the wrong state.

Bug: 22483380
Change-Id: I8d3ec303a43323431b8866df29ddd6d668edc1ed
 2015-07-16 17:23:26 -07:00
Lajos Molnar
d08debcf42 MediaSync: fix flush handling and deadlock 
- clear pending video frames
- flush audio track
- reset clock
- restart audio track after flush
- don't hold lock during callback

Bug: 22234976
Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856
 2015-07-16 17:09:20 -07:00
Svet Ganov
b0f8fee845 am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 
* commit '6f561a24c97d25a858cf98eef5c502ef8d80cfc1':
  Improve documentation of onRequestPermissionsResult
 2015-07-17 00:03:30 +00:00
Svet Ganov
6f561a24c9 Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 2015-07-16 23:51:53 +00:00
Todd Kennedy
2a89545739 clear calling identity to dexopt 
Bug: 22067670
Change-Id: I3596f26a079660f6898401ed679463193b00c799
 2015-07-16 16:39:46 -07:00
Adam Powell
666d82a6d5 Update ChooserTarget constructor to take ComponentName, Bundle 
Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
 2015-07-16 16:29:59 -07:00
Svet Ganov
0f45c7c7c4 Improve documentation of onRequestPermissionsResult 
bug:22524902

Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
 2015-07-16 16:29:04 -07:00
Roshan Pius
5926761865 am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev 
* commit '5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc':
  Maintain call time across SRVCC (2/3).
 2015-07-16 23:19:17 +00:00
Roshan Pius
5aff3b5489 Merge "Maintain call time across SRVCC (2/3)." into mnc-dev 2015-07-16 23:09:19 +00:00
Dirk Dougherty
e74643d3d1 Doc change: Update AFW behavior changes for Preview 2. 
Change-Id: I59216bb70448656a7eed38ba8c743b284eaf6300
 2015-07-16 15:57:34 -07:00
Alex Klyubin
e8ce214482 am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev 
* commit 'f7592b234acde62f0f0a93dad77284f12ca9980a':
  HMAC keys are authorized for exactly one digest.
 2015-07-16 22:49:54 +00:00
Alex Klyubin
f7592b234a Merge "HMAC keys are authorized for exactly one digest." into mnc-dev 2015-07-16 22:40:06 +00:00
Svet Ganov
c00e49b6e4 am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:23:38 +00:00
Chris Craik
7b0fa466b5 am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '0f724601d78d8f36a297333227d9c460e10b3203':
  Fix clip area behavior for REPLACE op
 2015-07-16 22:23:34 +00:00
Svet Ganov
d4b566bf56 Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 2015-07-16 22:22:01 +00:00
Chris Craik
0f724601d7 Merge "Fix clip area behavior for REPLACE op" into mnc-dev 2015-07-16 22:11:41 +00:00
Dianne Hackborn
9236af43d8 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 21:51:49 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Makoto Onuki
d737ab1776 am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 
* commit 'b09b84cafde5ac31f5ef5c79f7a78db540824471':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS
 2015-07-16 21:19:33 +00:00
Makoto Onuki
b09b84cafd Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 2015-07-16 21:01:39 +00:00
Chris Craik
8ce8f3f4d6 Fix clip area behavior for REPLACE op 
bug:22291400

Work around clippath-clipped-to-view-bounds behavior by
implementing REPLACE op fast path, avoiding the transition to
SkRegion/SkPath.

Change-Id: I63c1cf961db2d6e3759d83914de1036c9ac7497a
 2015-07-16 13:31:41 -07:00
Svet Ganov
f8847c02dc am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 19:27:18 +00:00
Svet Ganov
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +00:00