197740 Commits

Author SHA1 Message Date
Chien-Yu Chen
aa9a27bb9b Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 2015-07-17 17:01:30 +00:00
Eino-Ville Talvala
6e8a551f9f Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 2015-07-17 16:54:09 +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
6819b9a85c Remove focusablilty of the status bar.
This allows TTS readers to announce individual items in
the status bar separately.

Bug: 20536376
Change-Id: I88d9e2b72182814bf8906951b97871ddc697c5e0
2015-07-17 11:57:42 -04:00
Julia Reynolds
593aca12c2 Merge "Support 24 clock displays in demo mode." into mnc-dev 2015-07-17 15:54:10 +00:00
Chris Wren
365b6d3d01 add ticker to enqueue message for easier debugging
Bug: 22462619
Change-Id: Iadb28d251b55c1a1f241c0d0a4fb8e117b8030c0
2015-07-17 14:43:15 +00:00
Chris Wren
0c274b107c decide interruptions based on current data, not previous data.
shouldInterrupt() now takes an optional StatusBarNotification object that will
be used instead of the one on the entry.

Bug:22462619
Change-Id: I5a1d9205b22ad733d5bc582693edad26518e1959
2015-07-17 10:40:28 -04:00
Todd Kennedy
5fe22e4fcb Merge "clear calling identity to dexopt" into mnc-dev 2015-07-17 14:40:00 +00:00
Wale Ogunwale
24b243d53d Fixed bad merge conflict resolution
https://android-review.googlesource.com/#/c/137534/ was accepted
and merged on 03/04/15. However, a bad merge conflict resolution
caused half of the change to be reverted. This adds back the missing
change.

Change-Id: I4f7c2503e60321b692e12316961958b149baf4ea
2015-07-17 07:20:57 -07:00
Lajos Molnar
e6b407b4be Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 2015-07-17 13:24:27 +00:00
Simranjit Singh Kohli
ba0b10af5f [Fix MANAGE_USER permission in AccountManagerService]
It seems that curently there were situations where the init of
Accounts in cache could trigger MANAGE_USER permission needed errors.
The callers should make sure they are calling it after clearing
identity.

Bug: 22492964
Change-Id: I44e890ff03a3bf144c907f2692dc1c6be8816f11
2015-07-16 20:46:00 -07: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
Adrian Roos
8e3e83639b Protect demo mode commands with permission
Bug: 22542269
Change-Id: I828942723c0e4030127915fdce3000ad5f3b7a99
2015-07-16 19:43:40 -07:00
Fyodor Kupolov
7bd8be0019 Added a note about location permission
ACCESS_COARSE_LOCATION or ACCESS_FINE_LOCATION permission is required to get
results.

Bug: 21852542
Change-Id: I3a2746d691f4d7024b0bb7b884d4436c73ce82e6
2015-07-16 19:40:13 -07: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
Ricardo Garcia
47abda576e Fix for MidiManager bug
Returning null if MidiManager service can't be created instead
of crashing with NPE.

bug: 22087661
Change-Id: Ia27835ea1197af2db04c3e7f1d2e7c9f32fddbd0
2015-07-16 18:20:46 -07: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
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
Robert Greenwalt
906efe8f7e Support optional modem restart on certain errors.
bug:22455853
Change-Id: I5fc2f0080e581dd050b0422ff4ab56e86e57d522
2015-07-16 17:28:23 -07: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
Alex Klyubin
a95550f801 Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
This makes Android Keystore add the KM_MIN_MAC_LENGTH tag to generated
and imported HMAC and AES-GCM keys. This tag specifies the minimum
length of the MAC/authentication tag authorized to be used for the
key.

For HMAC keys the minimum MAC length is set to the length of the
digest associated with the key (HMAC keys are authorized for exactly
one digest). For AES keys the minimum authetication tag length is set
to 96 bit. This is the minimum supported by Android Keystore's AES-GCM
implementation.

Bug: 22337277
Change-Id: Ic6e47cf084734d1592788dc58088889f7fff74eb
2015-07-16 16:52:51 -07: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
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
f7592b234a Merge "HMAC keys are authorized for exactly one digest." into mnc-dev 2015-07-16 22:40:06 +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
Eino-Ville Talvala
14c09fa3c5 Camera2: Add hidden experimental tearDown method
Bug: 18949148
Change-Id: I6264d95a26ebf51cce6114c9a86b9561f7c60ab5
2015-07-16 14:55:26 -07: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
Tingting Wang
86ac228143 Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
This reverts commit d55b348e629d5ae5a2efbba6735be4b30220e50b.

Change-Id: I3e623de725c419489294aed6c3b3aea838fc0f7b
2015-07-16 21:19:28 +00:00
Alex Klyubin
53d544a4b9 KM module may consume less input than provided by finish time.
Keymaster1 HAL permits the implementation of "update" operation to
leave some input unconsumed by the time "finish" operation neeeds to
be invoked. This needs to be treated as "invalid input" error rather
than a "can't happen" exception.

This CL was confirmed to fix the issue by the vendor who encountered
the issue.

Bug: 22512100
Change-Id: Ibb1a37d58f650d03605612559a154ce2416d147c
2015-07-16 14:18:49 -07: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
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +00:00
Robert Schaub
081649c2b5 am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 18:57:39 +00:00
Julia Reynolds
c11d838bc5 Support 24 clock displays in demo mode.
Bug: 22388468
Change-Id: I0a9f1c214a1612dbc225386ae8777a1480dd14b0
2015-07-16 14:40:37 -04:00
Robert Schaub
f4db2de881 am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '1b29a95789c29174d5e4d526f6449c2c354ef3b3':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
2015-07-16 18:40:37 +00:00
Makoto Onuki
bc92479a29 DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Bug 22532312

Change-Id: If7ad0faa3a196bb28da1ddc13788c0430df1d1ee
2015-07-16 11:38:00 -07:00