197203 Commits

Author SHA1 Message Date
Chris Craik
e6a15ee3d0 Remove all usage of fmin and fmax
bug:22208220

Removes needless call, and upconversion to doubles in multiple places.

Change-Id: I1b949fa5f206446ac34de800154c0147d6bd8034
2015-07-07 18:42:42 -07:00
David Friedman
b517be4c87 am 5544cb42: am 6fa1ee64: am 41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs
* commit '5544cb421c38d2f0a966a69d112ca7685aa716f7':
  Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313
2015-07-08 01:27:26 +00:00
David Friedman
5544cb421c am 6fa1ee64: am 41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs
* commit '6fa1ee64fcd783294afa6ca99109b6351da7b6a1':
  Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313
2015-07-08 01:17:41 +00:00
Dianne Hackborn
c55c4a289c am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev
* commit 'b14dc048ec8323e4a10bbfe42129bb91616470b8':
  Add new "preinstalled" permission flag.
2015-07-08 01:08:05 +00:00
David Friedman
51fed06f0c am 05ca442f: am 3d0d02e6: am dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs
* commit '05ca442ff40bd958b33079447d77892e1a6dc979':
  docs: Preview 2 - Update downloads page
2015-07-08 01:08:01 +00:00
Dianne Hackborn
b14dc048ec Merge "Add new "preinstalled" permission flag." into mnc-dev 2015-07-08 01:03:46 +00:00
David Friedman
6fa1ee64fc am 41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs
* commit '41a722ab49e8b6dfed1de317e58867afd5bb5077':
  Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313
2015-07-08 01:00:38 +00:00
Ian Pedowitz
506b9dd013 am 2020178f: Merge "Revert "Set default SMS application to Messenger"" into mnc-dev
* commit '2020178f97c5826fdba773e83b397f11950a0249':
  Revert "Set default SMS application to Messenger"
2015-07-08 00:59:33 +00:00
David Friedman
05ca442ff4 am 3d0d02e6: am dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs
* commit '3d0d02e66864db3085fba75777f675d5e5cae200':
  docs: Preview 2 - Update downloads page
2015-07-08 00:56:53 +00:00
David Friedman
41a722ab49 Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug: 21789313" into mnc-preview-docs 2015-07-08 00:49:12 +00:00
Ian Pedowitz
2020178f97 Merge "Revert "Set default SMS application to Messenger"" into mnc-dev 2015-07-08 00:47:27 +00:00
Ian Pedowitz
64b756f121 Revert "Set default SMS application to Messenger"
This reverts commit a21d249e45abf99c2f4acbbb47bf00e9803db1aa.

Bug: 22261909
Change-Id: I064b8fe98eeec96a534c0f2ea3ec63057a5a1a1d
2015-07-08 00:46:54 +00:00
Jeff Sharkey
5af1835d67 Generate stable MTP storage IDs.
It ends up that MediaProvider is persisting MTP storage IDs in its
database, so we need to make sure we generate stable IDs over time,
otherwise we can end up looking into a black hole.

Bug: 22256092
Change-Id: I6a75c239aac1b71fd5f6df0df69b24971079a086
2015-07-07 17:46:16 -07:00
David Friedman
3d0d02e668 am dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs
* commit 'dafcaf72c6479af0efc4b7194e07a05039b66942':
  docs: Preview 2 - Update downloads page
2015-07-08 00:44:37 +00:00
Vineeta Srivastava
1a0c150dfe am 578eef70: Merge "Enforce camera shutter sound for India" into mnc-dev
* commit '578eef7001f1f70db8fecf24330ab7eb9a05a53a':
  Enforce camera shutter sound for India
2015-07-08 00:41:38 +00:00
David Friedman
e631d564e0 Docs: L10N of remaining M-Preview pages (Ja)
Bug: 21789313

Change-Id: I1e70749c29dc24d7242bf78da76136f184649626
2015-07-07 17:35:45 -07:00
David Friedman
dafcaf72c6 Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs 2015-07-08 00:31:57 +00:00
Vineeta Srivastava
578eef7001 Merge "Enforce camera shutter sound for India" into mnc-dev 2015-07-08 00:30:00 +00:00
Adrian Roos
ab6edbf8e0 Dump internal state of ImageWallpaper
Bug: 21148936
Change-Id: I09bea04594af7d3748db93d5b3a41b2209299ec2
2015-07-07 17:29:15 -07:00
Dianne Hackborn
a90c8def2c Add new "preinstalled" permission flag.
This allows you to specify that a permission can be granted to
any pre-installed system app (not just privileged ones).

And as long as I am doing this, clean up the old "system" permission
flag, renaming it to "privileged" which is what it really is today,
deprecating the old names.  And switch the platform's permission
declarations to use the new name.

Change-Id: Iabf484746af232144786851ec7fe90e3de9dddb2
2015-07-07 17:25:25 -07:00
Wale Ogunwale
31dd3a74c1 Set AppErrorDialog result during dismissal if it isn't already set
The system watch dog was triggering because all binder threads were
waiting for AppErrorResult#set() to be called which never happened.
One situation where this can occur is if a process continues to crash
and the activity manager marks the process as bad there by causing it
to kill the process immediately which causes a binder death
notification that automatically dismisses the app error dialog before
the user ACKs it.
We now set the result during dialog dismissal if it isn't already set.

Bug: 22141958
Change-Id: If3ac116df5e29c6fba43ee556a859ad3c84c66f3
2015-07-07 17:24:54 -07:00
Sungmin Choi
3649231c1e Enforce camera shutter sound for India
Bug: 22187754
Change-Id: I422bd3654f7cb6382db5101b0d7c8fd5bdce8dac
2015-07-07 17:15:28 -07:00
Dianne Hackborn
5e44927699 am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit 'f2474d336a7df696f3897e2cd255d138eb3fac02':
  Implement better handling of text in assist.
2015-07-07 23:56:57 +00:00
Andrew Solovay
bf23bfeac1 am b2f9c284: am 40122447: am d73098bc: docs: Added new NORMAL permissions
* commit 'b2f9c284cdf1835e48ebbc6b3995590a1b308bf2':
  docs: Added new NORMAL permissions
2015-07-07 23:56:53 +00:00
Svetoslav
240f8e5f35 am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev
* commit '3e07ee078de8e364d6be0b18b2b514e40decdb3c':
  Grant installer and verifier install permissions robustly
2015-07-07 23:56:49 +00:00
Dianne Hackborn
f2474d336a Merge "Implement better handling of text in assist." into mnc-dev 2015-07-07 23:51:06 +00:00
Jeff Sharkey
79204a32bd am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev
* commit '15369c6c3ba50a852ed0c499eb5929436cffa005':
  Fix volume naming when surfaced over MTP.
2015-07-07 23:49:10 +00:00
Christopher Tate
7f25ad62b0 am 15bb16fb: Merge "App linking: permit overlapping link handling" into mnc-dev
* commit '15bb16fb48f523b6b0d8c03cfe5988096341e29d':
  App linking: permit overlapping link handling
2015-07-07 23:49:05 +00:00
Dianne Hackborn
6f0fdc4167 Implement better handling of text in assist.
TextView is now much smarter about the text it reports, limiting it
to what is visible (plus a bit more).  Also add a facility for it to
report where the lines of text are, both as offsets in the text string
and their baselines on screen.

Part of fixing issue #22328792: Fix scalability issues in AssistStructure

Change-Id: Idddb8c3a3331355f381e2d4af06d520fe7c7ce8e
2015-07-07 16:47:37 -07:00
Andrew Solovay
b2f9c284cd am 40122447: am d73098bc: docs: Added new NORMAL permissions
* commit '401224472311ecd23734eb6fe730456dcb4349de':
  docs: Added new NORMAL permissions
2015-07-07 23:47:17 +00:00
Svetoslav
3e07ee078d Merge "Grant installer and verifier install permissions robustly" into mnc-dev 2015-07-07 23:44:34 +00:00
Jeff Sharkey
15369c6c3b Merge "Fix volume naming when surfaced over MTP." into mnc-dev 2015-07-07 23:42:44 +00:00
Jim Miller
0fd6914489 am e86f1752: Merge "Use custom theme for keyguard presentation" into mnc-dev
* commit 'e86f175229f5cf7b6149ecc19cf8de60be722293':
  Use custom theme for keyguard presentation
2015-07-07 23:37:43 +00:00
Alan Viverette
407630e765 am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev
* commit 'f12c91f5e67171bae0d36e89a507c96ff81d04a2':
  Remember focused child during layout when adapter has stable IDs
2015-07-07 23:37:39 +00:00
Adrian Roos
0f7b02733d am 38586bff: Merge "Fix bug that prevented waking from dream" into mnc-dev
* commit '38586bfff9b8194c86f1363d63e971bbbc6ee843':
  Fix bug that prevented waking from dream
2015-07-07 23:37:35 +00:00
Christopher Tate
15bb16fb48 Merge "App linking: permit overlapping link handling" into mnc-dev 2015-07-07 23:35:51 +00:00
Jim Miller
e86f175229 Merge "Use custom theme for keyguard presentation" into mnc-dev 2015-07-07 23:33:22 +00:00
Andrew Solovay
4012244723 am d73098bc: docs: Added new NORMAL permissions
* commit 'd73098bcf540480cb1f298bb1b775e64fe4b2567':
  docs: Added new NORMAL permissions
2015-07-07 23:31:26 +00:00
Alan Viverette
f12c91f5e6 Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev 2015-07-07 23:26:36 +00:00
Robin Lee
59ca7dd005 am 846362fa: Merge "Use \'dp\' paddings instead of \'mm\' for VPN dialogs" into mnc-dev
* commit '846362fa06e717784e2e60882c83c20a9350b1a7':
  Use 'dp' paddings instead of 'mm' for VPN dialogs
2015-07-07 23:22:30 +00:00
Adrian Roos
38586bfff9 Merge "Fix bug that prevented waking from dream" into mnc-dev 2015-07-07 23:22:23 +00:00
John Reck
c452654a45 Restrict number of hwuiTask threads
Bug: 22324907
Change-Id: I0013557ede15949a5bd6f3f75bc5dd023a9f945b
2015-07-07 16:19:57 -07:00
Robin Lee
846362fa06 Merge "Use 'dp' paddings instead of 'mm' for VPN dialogs" into mnc-dev 2015-07-07 23:07:33 +00:00
Jim Miller
1075a27c69 am b5e3eba1: Merge "SystemUI/Keyguard: try authenticate finger after authentication failure" into mnc-dev
* commit 'b5e3eba1665f0a5f42bcfc2630d67011edb70f05':
  SystemUI/Keyguard: try authenticate finger after authentication failure
2015-07-07 22:53:58 +00:00
Jim Miller
c90d64583c Use custom theme for keyguard presentation
The default Material theme for presentations on external displays
has a white background.  This changes keyguard to use a custom theme
since we want white lettering on black.

Fixes bug 22305037

Change-Id: Idc6aca2398be34c4603446983e5d276abcace001
2015-07-07 15:49:05 -07:00
Alex Klyubin
5c38e7918a Reject AlgorithmParameters of wrong type.
This makes Android Keystore Cipher implementations reject rather than
ignore AlgorithmParameters of wrong algorithm type. The danger in not
doing so is that a Cipher will produce output that does not actually
depend on the provided AlgorithmParameters.

Bug: 22330716
Change-Id: Ifa9de2c74f2fe4b738a3731c895059dddd075a13
2015-07-07 15:39:10 -07:00
Jim Miller
b5e3eba166 Merge "SystemUI/Keyguard: try authenticate finger after authentication failure" into mnc-dev 2015-07-07 22:39:03 +00:00
Jim Miller
f2d9ad2e90 SystemUI/Keyguard: try authenticate finger after authentication failure
When first authentication is failed, keyguard does not try authenticate again.
This modification makes to try again authentication
when it receives callback of authentication failure.

Bug: 22131472
Change-Id: I5bdfc8b120595bf3252ad6e7353ace7ff7fbbae0
2015-07-07 15:32:00 -07:00
Ian Pedowitz
00c713fd37 am 1c677b1e: Merge "Set default SMS application to Messenger" into mnc-dev
* commit '1c677b1e40db70bf3b582f1880e352feff9dd94f':
  Set default SMS application to Messenger
2015-07-07 22:28:45 +00:00
Andrew Solovay
4a4603f693 am 700b54ab: am c9c15793: am 8b9d55e4: docs: Removed extraneous "system components" info
* commit '700b54aba3417344132e3829b3a4b70a453ee000':
  docs: Removed extraneous "system components" info
2015-07-07 22:28:41 +00:00