186914 Commits

Author SHA1 Message Date
Bryce Lee
7eeaad244c am 7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev
* commit '7a1454fe69bc2aa561874e550b05d5cb218bc047':
  Do not use the status bar as the system decor layer if it is not visible.
2015-04-01 19:15:11 +00:00
Bryce Lee
7a1454fe69 Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev 2015-04-01 19:09:34 +00:00
Scott Rowe
ab8c34ffc4 docs: Building Live TV Apps
Change-Id: I8d0015e6c8a8a24c661434ca5cf88defd27ae8cf
2015-04-01 12:06:08 -07:00
Alex Klyubin
3984bbc025 am 838f054f: am a4ea4726: am c461452e: Merge "Hook in user authenticators and their exceptions."
* commit '838f054f88447d575afff105810800d95dd3eb13':
  Hook in user authenticators and their exceptions.
2015-04-01 18:57:38 +00:00
Alex Klyubin
ef17b73c6a am 93e029e0: am f00cdf68: am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
* commit '93e029e0066737f9f09f6dfef95dc664dc236b15':
  A way to obtain KeyStore operation handle from crypto primitives.
2015-04-01 18:57:31 +00:00
Wale Ogunwale
16a6279e5f resolved conflicts for merge of 2094bf7b to master
Change-Id: I1820d186ca602bb3cd21a15f3c23f7d6d309d43b
2015-04-01 11:54:26 -07:00
Andrew Solovay
6f09c95c51 am 3e3af524: am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo.
* commit '3e3af5247f7d811f0427bbc1f39fc0582e05f374':
  docs: Fixed a typo.
2015-04-01 18:43:15 +00:00
Andrew Solovay
3e3af5247f am 79c587ed: am aabcf5b5: am b2255d4f: docs: Fixed a typo.
* commit '79c587eda40f3af622f9d1b81aa5a81682e985e4':
  docs: Fixed a typo.
2015-04-01 18:32:46 +00:00
Andrew Solovay
79c587eda4 am aabcf5b5: am b2255d4f: docs: Fixed a typo.
* commit 'aabcf5b562b6ebad59d1789c73d054782d5f25e4':
  docs: Fixed a typo.
2015-04-01 18:21:31 +00:00
Andrew Solovay
aabcf5b562 am b2255d4f: docs: Fixed a typo.
* commit 'b2255d4f10230b51de373528aaee7b12cc9e2f2b':
  docs: Fixed a typo.
2015-04-01 18:11:01 +00:00
Alex Klyubin
838f054f88 am a4ea4726: am c461452e: Merge "Hook in user authenticators and their exceptions."
* commit 'a4ea47269040963301101b1b1a28d598b41219b8':
  Hook in user authenticators and their exceptions.
2015-04-01 18:04:58 +00:00
Alex Klyubin
93e029e006 am f00cdf68: am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
* commit 'f00cdf68cd1b96f822b3711cd4e39c9ad903ce21':
  A way to obtain KeyStore operation handle from crypto primitives.
2015-04-01 18:04:54 +00:00
Olawale Ogunwale
2094bf7bfd am 4e88ecf4: am 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"
* commit '4e88ecf4bc344557af31eb367e6e01b2d5b60471':
  [ActivityManager] Reduce report wrong anr activity
2015-04-01 18:04:50 +00:00
Raph Levien
39b4db73c3 Add breakStrategy attribute to TextView
This patch adds plumbing to TextView to control the strategy used
for breaking paragraphs into lines.

The default for TextView is "quality", while the default for EditText
is "simple", largely to avoid too much re-layout when editing.

StaticLayout now has a builder which provides access to more
functionality and is also cleaner than the old mechanism of having
lots of constructors with varying numbers of arguments. This patch
changes TextView to use that builder, and also contains cleanups
of the Builder within StaticLayout.

Change-Id: Iee3cf3a05a3e51ba0834554e4a3ec606e9cabca5
2015-04-01 11:01:41 -07:00
Bryce Lee
ae41dcab07 Do not use the status bar as the system decor layer if it is not visible.
Doing so leads to cropping of the content view, which is smaller than the
screen size on some devices with improperly configured overscan values. It
can also lead to performance issues with some activity transition
animations on Wear.

Bug: 19928768
Change-Id: Ic50c2fedb1f8be9a8ea5166fef5a5665958601de
2015-04-01 10:57:21 -07:00
Alex Klyubin
a4ea472690 am c461452e: Merge "Hook in user authenticators and their exceptions."
* commit 'c461452eb78867032092b2fce14c2fcb3e7ab34e':
  Hook in user authenticators and their exceptions.
2015-04-01 17:57:06 +00:00
Alex Klyubin
f00cdf68cd am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives."
* commit 'c6cc9d820d007a6b11df2bb3274d40743e1f1d87':
  A way to obtain KeyStore operation handle from crypto primitives.
2015-04-01 17:57:00 +00:00
Olawale Ogunwale
4e88ecf4bc am 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"
* commit '086071e7306a73c9b3c5a56277884b4e19543b3e':
  [ActivityManager] Reduce report wrong anr activity
2015-04-01 17:56:53 +00:00
Alex Klyubin
5045b7189c Use Keymaster-friendly validity dates.
Keymaster HAL currently requires that key validity start and end dates
always be specified. The framework API does not. This CL expresses
the framework API's "not specified" instants to Keymaster as instants
in distant past or future.

Bug: 18088752
Change-Id: Ia9d66d5e57bfca30628cdef6e0925a2781a3acfb
2015-04-01 10:44:30 -07:00
Alex Klyubin
c461452eb7 Merge "Hook in user authenticators and their exceptions." 2015-04-01 17:34:37 +00:00
Alex Klyubin
c6cc9d820d Merge "A way to obtain KeyStore operation handle from crypto primitives." 2015-04-01 17:34:08 +00:00
Mark Salyzyn
222ab66205 am 1c329e85: am 855998d0: am c90a4418: Merge "idmap: scan missing include for sys/stat.h"
* commit '1c329e856a1a7cdef6e55ee0269837a234631f75':
  idmap: scan missing include for sys/stat.h
2015-04-01 17:33:31 +00:00
Olawale Ogunwale
086071e730 Merge "[ActivityManager] Reduce report wrong anr activity" 2015-04-01 17:32:37 +00:00
Mark Salyzyn
6b115be0a2 am fa037c65: am f942e36a: am 5218065d: Merge "app_main missing include for sys/stat.h"
* commit 'fa037c65d37b911024d597415beea3a9368a6fb5':
  app_main missing include for sys/stat.h
2015-04-01 17:27:21 +00:00
Mark Salyzyn
1c329e856a am 855998d0: am c90a4418: Merge "idmap: scan missing include for sys/stat.h"
* commit '855998d0d1a78b1ab1ba8f012cdadd57f3d942dd':
  idmap: scan missing include for sys/stat.h
2015-04-01 17:20:54 +00:00
Mark Salyzyn
855998d0d1 am c90a4418: Merge "idmap: scan missing include for sys/stat.h"
* commit 'c90a44184f775863f4cb7698ed7f92d7b2d83e60':
  idmap: scan missing include for sys/stat.h
2015-04-01 17:11:11 +00:00
Mark Salyzyn
fa037c65d3 am f942e36a: am 5218065d: Merge "app_main missing include for sys/stat.h"
* commit 'f942e36a07e8c5e93c1084294350905cebc817a9':
  app_main missing include for sys/stat.h
2015-04-01 16:59:44 +00:00
Mark Salyzyn
c90a44184f Merge "idmap: scan missing include for sys/stat.h" 2015-04-01 16:53:53 +00:00
Mark Salyzyn
b62286e60c idmap: scan missing include for sys/stat.h
scan.cpp gets sys/stat.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for sys/stat.h in this
include file.

Bug: 19908228
Change-Id: If547e86513b06c536972138ae571c3d9c714ffe9
2015-04-01 16:52:14 +00:00
Mark Salyzyn
f942e36a07 am 5218065d: Merge "app_main missing include for sys/stat.h"
* commit '5218065dec34abdb15ee2fb5fffa86207b6b57a8':
  app_main missing include for sys/stat.h
2015-04-01 16:49:02 +00:00
Luan Nguyen
fcf7db9769 docs: Add voice intent for starting a stopwatch
bug: 19931486
Change-Id: I9895966da1203e1f95ac29a61f9613548b8f2177
2015-04-01 09:33:16 -07:00
Etan Cohen
50d4761830 Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
Original file was moved from packages/apps/Settings to frameworks/base.

Change-Id: I26912c0461780a255281a135c60cc0da2d25ae5a
2015-04-01 09:32:40 -07:00
Etan Cohen
eb864d4000 Merge commit 'd91f193' into merge2 2015-04-01 09:31:43 -07:00
Etan Cohen
227542a3d1 Merge commit '5718646' into merge2 2015-04-01 09:31:20 -07:00
Etan Cohen
41dc421322 Merge commit '7aa0345' into merge2 2015-04-01 09:31:04 -07:00
Mark Salyzyn
5218065dec Merge "app_main missing include for sys/stat.h" 2015-04-01 16:28:05 +00:00
Luan Nguyen
66cd54a6e6 docs: Remove misleading information about hardware layer performance
benefits for optimizing views.

bug: 18356775
Change-Id: Ideac15f1eb42fe4c2e291800458bf739cd6a9b4a
2015-04-01 09:16:21 -07:00
Mark Salyzyn
fc737fb76c app_main missing include for sys/stat.h
app_main.c gets sys/stat.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for sys/stat.h in this
include file.

Bug: 19908228
Change-Id: I477b825e582742113f849aaa1df50c41e496b6f6
2015-04-01 16:02:32 +00:00
Jason Monk
726fb28248 Change carrier text to 'airplane mode' when on
Bug: 18833886
Change-Id: Iae757cacb7770cbe7e3509a943c78d04ee0f99f4
2015-04-01 11:49:54 -04:00
Olawale Ogunwale
78c926c9a3 am bcfa7cb2: am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"
* commit 'bcfa7cb2508eb6f606aeef4c6cb44eaf9be07ccf':
  [ActivityManager] Improve multi-thread access the same provider
2015-04-01 15:37:34 +00:00
Olawale Ogunwale
bcfa7cb250 am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"
* commit '259a649a935ca2ed63419a079211b0ac35f67496':
  [ActivityManager] Improve multi-thread access the same provider
2015-04-01 15:28:16 +00:00
Wale Ogunwale
ee006da858 Converted more log points in AMS to use ActivityManagerDebugConfig.
Change-Id: I59e777de30e2e9a3c7d086dc634129cd19135fab
2015-04-01 08:28:14 -07:00
Olawale Ogunwale
259a649a93 am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"
* commit '6091dcbb80d3b1b885b6e02386ccb3139e5e43ae':
  [ActivityManager] Improve multi-thread access the same provider
2015-04-01 15:18:45 +00:00
Olawale Ogunwale
6091dcbb80 Merge "[ActivityManager] Improve multi-thread access the same provider" 2015-04-01 14:58:21 +00:00
Geoff Mendal
066be66d60 Merge "Import translations. DO NOT MERGE" 2015-04-01 12:35:05 +00:00
Geoff Mendal
e201fa8066 Merge "Import translations. DO NOT MERGE" 2015-04-01 12:22:13 +00:00
Geoff Mendal
ad1b35aa77 Import translations. DO NOT MERGE
Change-Id: I3626ff76ad51e22c35904023ae530f0f2b18b3f1
Auto-generated-cl: translation import
2015-04-01 05:09:43 -07:00
riddle_hsu
db46d6b074 [ActivityManager] Reduce report wrong anr activity
Symptom:
Report ANR on wrong activity.

Reproduce steps:
 (All launchMode, taskAffinity are default and
  without additional intent flag)
 Case 1:
  1.Launch activity A from launcher.
  2.Activity A starts B activity.
  3.Press home key.
  4.Launch activity A from launcher (B is top).
  5.Press back key twice to finish B and A,
    A sleep 10s in onResume.
  6.ANR will report on launcher.

 Case 2:
  1.Launch activity A from launcher.
  2.Press home key.
  3.Kill process of A.
  4.Launch activity A from launcher.
  5.A sleep 10s in onResume, press back key immediately.
  6.ANR will report on launcher.

Possible root cause:
Focused activity will not be updated every time when activity
resumed. (the condition to call setFocusedActivityLocked)

Case 1:
Launcher was stopped and not waitingVisible due to launcher
is not the previous one, then getWaitingHistoryRecordLocked
has no chance to correct the real ANR activity.

Case 2:
Due to process of next activity is died, bring existed
task will not set mResumedActivity (it will be set when its
process is started), so when assigning waitingVisible from
processStoppingActivitiesLocked, the return value of
allResumedActivitiesVisible will be true even there is no
mResumedActivity. That results set waitingVisible to false
to previous activity (e.g. launcher), then also cannot
correct ANR target as case 1.

Change-Id: I0b24f46a8fab266382ebc6e2ed84ebeca9358768
2015-04-01 18:58:07 +08:00
Geoff Mendal
670973a834 am 47121c5e: (-s ours) am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE
* commit '47121c5e1e42e68345b6b994091904549509cfe4':
  Import translations. DO NOT MERGE
2015-04-01 10:28:45 +00:00
Geoff Mendal
3a4f024ae0 Import translations. DO NOT MERGE
Change-Id: I72a0fc2dbbf1028462653ee5b97094508c4064c6
Auto-generated-cl: translation import
2015-04-01 03:23:27 -07:00