194426 Commits

Author SHA1 Message Date
Paul Jensen
16bef48d22 Merge "Add support for tel: links in captive portal app." into mnc-dev 2015-06-09 17:11:10 +00:00
Richard Uhler
659716d7a0 Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 2015-06-09 16:40:57 +00:00
Julia Reynolds
058652c23d Merge "Remove the ability to set a preferred setup activity." into mnc-dev 2015-06-09 16:37:57 +00:00
Julia Reynolds
cedd53adc3 Remove the ability to set a preferred setup activity.
Bug: 21557327
Change-Id: I8c1809d25c5f5fcd186dfc0636d8ac47ed5fc903
2015-06-09 12:34:27 -04:00
Sudheer Shanka
0fcf4161c5 Merge "Update some strings." into mnc-dev 2015-06-09 16:26:12 +00:00
Chris Craik
342540c030 Merge "Add tracing to GLSurfaceView" into mnc-dev 2015-06-09 16:14:43 +00:00
Tony Mantler
eeb3443cc6 Merge "Add uses-sdk to reduce red squigglies" into mnc-dev 2015-06-09 16:04:45 +00:00
Sudheer Shanka
5b1a21a385 Update some strings.
Bug: 20518822
Change-Id: I22ed55cf44575a484f727965e2f8f6095f7f2be0
2015-06-09 14:19:07 +01:00
Paul Jensen
fd54da9b7c Add support for tel: links in captive portal app.
Bug:21447011
Change-Id: I72ec4fd780ddb89cecfa584aa285f3822f326810
2015-06-09 07:50:51 -04:00
Narayan Kamath
3eb63dc35e Merge "Move linking and directory creation logic to installd." into mnc-dev 2015-06-09 11:31:08 +00:00
Sudheer Shanka
3c300f0d77 Merge "Update AfW related strings." into mnc-dev 2015-06-09 11:26:55 +00:00
Sudheer Shanka
427422d822 Update AfW related strings.
Bug: 20518822
Change-Id: I83304a44457c3942b2def6fc4f2c9a369f61d232
2015-06-09 12:13:23 +01:00
Narayan Kamath
e845a1ef64 Move linking and directory creation logic to installd.
bug: 20889739

Change-Id: I1763376a2fbb25f3a3d55f60c1940cdbddcded07
2015-06-09 10:36:37 +00:00
Erik Kline
1162744fed Merge "Make public Network#bindSocket(FileDescriptor)." into mnc-dev 2015-06-09 07:48:01 +00:00
Erik Kline
d895999858 Make public Network#bindSocket(FileDescriptor).
Code that uses android.system.Os to create sockets as FileDescriptors
should be able to bind them to networks.  Note that FileDescriptors
could already be marked as "protected from VPNs" via
NetworkUtils#protectFromVpn(), but heretofore were not easily bound
to any particular network.

Bug: 21449922
Change-Id: I4bb86db5d95d5a55bb2d7e245848d11eaa351e65
2015-06-09 16:19:24 +09:00
Jinsuk Kim
5795a25cad Merge "TIF: Generate hardware input id in language-neutral fashion" into mnc-dev 2015-06-09 04:49:08 +00:00
Jinsuk Kim
4b20865817 TIF: Generate hardware input id in language-neutral fashion
For certain RtoL languages, digit used as a part of input id
(like HW0) is also localized, hence language change results in
the duplicated inputs for an identical hardware. This CL
changes the way the id is built to language-neutral fashion,
and keeps the digit used in the id in Arabic.

Bug: 21523750
Change-Id: I8f95e0209eeee16ceb543e574ef9ed572e4d031f
2015-06-09 13:09:16 +09:00
Jeff Sharkey
e3d670dc1e Merge "Format volumes with "auto" filesystem type." into mnc-dev 2015-06-09 03:25:10 +00:00
Jorim Jaggi
8972c2a0c7 Fix lockscreen launch animations
- Fix the case in WindowAnimator where the real window was ready
to draw while the starting window was playing the unlock animation.
- Always delay Keyguard done when clicking on a notification. Some
notifications started services/broadcasts instead and thus we didn't
wait, making it a jarring transition. In case the notification click
doesn't result in an activity start at all, we still have the timeout
that saves us from freezing (3s), but most notifications should start
an activity.

Bug: 19412725
Change-Id: I78f6839f59986f8f7ecdff70227d5690a504f475
2015-06-09 02:31:53 +00:00
Jim Miller
4f364c9e5f Fix NPE cause by new fingerprint permission check
We no longer send fingerprintid to non-privileged apps. Though
Keyguard can get the permission, it does not currently use fingerprint
info, so remove the API call.

Fixes bug 21040383

Change-Id: I8a9461ed138c368afc75601fe6d4eadc9a8b91c5
2015-06-08 19:24:13 -07:00
Jim Miller
800ebfc166 Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev 2015-06-09 01:46:22 +00:00
Jeff Sharkey
4e83cc9fc1 Format volumes with "auto" filesystem type.
Bug: 20275581
Change-Id: Id4c7e1ad83f28110a77fecf563e1bcb8ca4d4d9a
2015-06-08 18:34:23 -07:00
Alex Klyubin
12742ab5f4 Merge "Deprecate KeyChain.isBoundKeyAlgorithm." into mnc-dev 2015-06-09 00:51:28 +00:00
Chris Craik
59b429d106 Add tracing to GLSurfaceView
bug:21195272

Change-Id: I96bce6d6021fc720c73993202ba90997b0fc0e09
2015-06-08 17:40:00 -07:00
Jorim Jaggi
b835dd7641 Close assist when launching intents from notification shade
Bug: 21035363
Change-Id: I51a6dbe5f0d93aaf81a38d1f1afacaaeaf7732e2
2015-06-09 00:31:12 +00:00
Guang Zhu
53b3bb072b Merge "clean up Process instance after we are done with the sub process" into mnc-dev 2015-06-09 00:30:39 +00:00
Jorim Jaggi
2d144063a6 Merge "Fix flickering in alarm detail transition" into mnc-dev 2015-06-09 00:30:12 +00:00
Jorim Jaggi
2ba5979368 Fix flickering in alarm detail transition
Bug: 21400392
Change-Id: I28e4c0cbaa322d8711c5a84cd0ff7b409913b935
2015-06-08 17:29:33 -07:00
Jorim Jaggi
46ac19f32c Use better interpolator when clicking on QS header
This interpolator feels nicer when the reason why it animates comes
from a touch.

Change-Id: Ie13466c092e9546f8a8c5fdca589b35f78cde88c
2015-06-09 00:23:18 +00:00
Jorim Jaggi
59ec304eae Don't invert legacy notifications
Bug: 19130917
Change-Id: Id06fcf8fb11b783360a86534e024164b230e84a4
2015-06-09 00:20:51 +00:00
Jorim Jaggi
7b5e6c884d Merge "Only doze when not occluded" into mnc-dev 2015-06-09 00:20:30 +00:00
Jorim Jaggi
5cc86599ce Dismiss Keyguard correctly
When authenticating with fingerprint, we didn't go through the
dismiss action, and thus launching intents was broken when
authenticating with fingerprint from the bouncer. Also fixed a crash.

Bug: 21695578
Change-Id: I61f74b5b63d4d6ddf7f8f3ce96feb63b9644cd52
2015-06-09 00:10:09 +00:00
Zach Johnson
d56958c440 Merge "Ignore carrier apps when checking for idleness" into mnc-dev 2015-06-09 00:06:29 +00:00
Jorim Jaggi
8396970065 Only doze when not occluded
This fixes a bug where an activity could have been started on top of
the lockscreen while dozing already. In that case, we would execute a
pulse and reveal the fully colored activity that is occluding the
Keyguard

Bug: 19465785
Change-Id: I9533390e13f11424a20a107005d60050a460e333
2015-06-09 00:02:55 +00:00
Selim Cinek
196597b7c0 Merge "Children which are removed when HUNd now animate out" into mnc-dev 2015-06-09 00:00:06 +00:00
Prerepa Viswanadham
8711ed644b Merge changes from topic 'modemActivityInfo' into mnc-dev
* changes:
  API for get modem activity info
  Activity info and stats from modem
2015-06-08 23:44:51 +00:00
Jim Miller
f501b58de8 Update and cleanup FingerprintManager API to new spec
Fixes bug 21040383

Change-Id: Ib97d486535869814d5b449cccb31670e8f412552
2015-06-08 16:36:29 -07:00
Adam Lesinski
4cf59747f8 Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 2015-06-08 23:14:17 +00:00
Dongwon Kang
0dd7ddc414 Merge "Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()" into mnc-dev 2015-06-08 22:58:56 +00:00
John Reck
62043203df Merge "Delete unused" into mnc-dev 2015-06-08 22:51:43 +00:00
Tony Mantler
204a1d9bae Add uses-sdk to reduce red squigglies
Change-Id: I70257d7c643b904d8d5a4c462f00267dc0711cd4
2015-06-08 15:46:51 -07:00
John Reck
4538ef2abc Delete unused
Change-Id: If27e1eb8e42313eae14df58a24ca54fafb2992fa
2015-06-08 15:45:58 -07:00
Jonathan Basseri
623bf636de Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 2015-06-08 22:27:34 +00:00
Adam Lesinski
df6235cd76 Bump the BatteryStats parcel VERSION
A previous change forgot to bump the version, leading to
corrupt data.

Bug:19683715
Bug:21574065
Change-Id: I30c9039694b02d576909e8f60c25f175986b8c5c
2015-06-08 15:04:16 -07:00
Filip Gruszczynski
5e4c382d15 resolved conflicts for merge of 17ba2e6c to mnc-dev
Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0
2015-06-08 15:00:25 -07:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
2015-06-08 14:59:09 -07:00
Dongwon Kang
b0cf7ea65d Make MediaProjectionPermissionActivity secure with setFilterTouchesWhenObscured()
Bug: 21485727
Change-Id: I6b639464a3543dec4d7a248bdd8042b2c3872fac
2015-06-08 14:16:54 -07:00
John Spurlock
e37cf3b8d6 Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev 2015-06-08 21:03:57 +00:00
Joseph Wen
d8ffe624b2 Merge "Update Statement Service." into mnc-dev 2015-06-08 20:56:25 +00:00
Geoff Mendal
59b28c0c9c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 20:53:03 +00:00