176152 Commits

Author SHA1 Message Date
Scott Rowe
4fc3d3ff40 Merge "docs: Building Live TV Apps" into lmp-docs 2015-04-01 21:05:42 +00:00
Alex Klyubin
39b9918631 am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
* commit '97467d82a31964e36cb6bc32ac4cf00e884c190e':
  Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
2015-04-01 20:38:07 +00:00
Alex Klyubin
78014a7815 am 04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '04047af628338aa7859ae1f24700e1e4e3ae63e7':
  Use Keymaster-friendly validity dates.
2015-04-01 20:21:00 +00:00
Alex Klyubin
97467d82a3 Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString." 2015-04-01 20:15:53 +00:00
Andreas Gampe
7598a248bd am e816f917: Merge "Frameworks/base: Use system property for cache prune counter"
* commit 'e816f917e0e1c21c8019436744284630f2408dc0':
  Frameworks/base: Use system property for cache prune counter
2015-04-01 20:10:22 +00:00
Alex Klyubin
3f24a1d94a Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
This makes the hidden API android.net.Uri.toSafeString omit most parts
of HTTP, HTTPS, and FTP URLs to avoid leaking anything unsafe. Only
the host and port are retained for these URLs.

Bug: 19215516
Change-Id: I2e9e33d9afaa9de5dd07a40532d56f0a2179f62a
2015-04-01 13:09:22 -07:00
Luan Nguyen
e5bc03da07 am d7fe75d6: am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit 'd7fe75d687935060557920ff2e515b7246958405':
  docs: Update ambient mode to mention disabling bitmap filtering
2015-04-01 20:05:17 +00:00
Luan Nguyen
0c50a4f15c am 13803e43: am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '13803e43b3196378d26fac8104d211b1224cb9f1':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
2015-04-01 20:05:11 +00:00
Luan Nguyen
b79d9912c7 am b9b2801d: am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit 'b9b2801da423a1ce79b8738ef7ce8d8a6e4e8532':
  docs: Add voice intent for starting a stopwatch
2015-04-01 20:05:05 +00:00
Alex Klyubin
04047af628 Merge "Use Keymaster-friendly validity dates." 2015-04-01 20:01:00 +00:00
Luan Nguyen
d7fe75d687 am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '92aa846daf64119d5951453c0298f83115f26d48':
  docs: Update ambient mode to mention disabling bitmap filtering
2015-04-01 19:55:08 +00:00
Luan Nguyen
13803e43b3 am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '03bafac781492fed392cb6bcdc8773a44076c705':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
2015-04-01 19:55:02 +00:00
Luan Nguyen
b9b2801da4 am b2bd8f8a: am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit 'b2bd8f8ac8405beaa5b531d1e23256315d7555bc':
  docs: Add voice intent for starting a stopwatch
2015-04-01 19:54:52 +00:00
Andreas Gampe
e816f917e0 Merge "Frameworks/base: Use system property for cache prune counter" 2015-04-01 19:52:27 +00:00
Andreas Gampe
e324ba0e7c Frameworks/base: Use system property for cache prune counter
Expose ART's -Xzygote-max-boot-retry through a new system property
dalvik.vm.zygote.max-boot-retry.

Bug: 19983101
Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
2015-04-01 19:50:58 +00:00
Luan Nguyen
92aa846daf am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit 'd01ada25155ed82644b9cc23313c04d3f1a5721a':
  docs: Update ambient mode to mention disabling bitmap filtering
2015-04-01 19:43:57 +00:00
Luan Nguyen
03bafac781 am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '649d839b82a8fafc99ae79ba1ad5fc12218391cb':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
2015-04-01 19:43:54 +00:00
Luan Nguyen
b2bd8f8ac8 am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '7542c44ee45a195404eccf50a82df7903e2ecd9c':
  docs: Add voice intent for starting a stopwatch
2015-04-01 19:43:39 +00:00
Luan Nguyen
d01ada2515 Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs 2015-04-01 19:24:31 +00:00
Luan Nguyen
649d839b82 Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs 2015-04-01 19:23:22 +00:00
Luan Nguyen
7542c44ee4 Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs 2015-04-01 19:21:41 +00:00
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
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
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
Olawale Ogunwale
086071e730 Merge "[ActivityManager] Reduce report wrong anr activity" 2015-04-01 17:32:37 +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
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
Mark Salyzyn
5218065dec Merge "app_main missing include for sys/stat.h" 2015-04-01 16:28:05 +00:00
Ronnie Leng
4c5c6f43dd [ProcessStas] fix index out of bounds when add duration.
Root Cause:
There is a defect in current ProcessStats design
and following is the scenario:
1. Process A is started due to activity with
name of A
2. Process A creates ProessState with application
uid of A
3. Process B is started due to isolated service
declared in application A with name of A
4. Process B uses ProcessState of Process A as
it uses same application uid of A
5. Process B is finished and it leads to
ProcessState marked as dead
6. Process A still keeps using the invalid
ProcessState in dead state
7. IndexOutOfBoundsException is triggered when
system tries to update process state of Process A

Resolution:
use process uid to replace application uid for
getProcessStatLocked.

Change-Id: I881ad9fc492c9e1a892c9e957180cebcfef8352d
Signed-off-by: Ronnie Leng <ronnie.leng@gmail.com>
2015-04-01 11:23:45 -05: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
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
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
22c930457a am 568039dd: (-s ours) Import translations. DO NOT MERGE
* commit '568039dda61f9245cd37901c5c2284e6cc79bda4':
  Import translations. DO NOT MERGE
2015-04-01 10:07:56 +00:00
Geoff Mendal
568039dda6 Import translations. DO NOT MERGE
Change-Id: I488ba02367861ca1c84acd44e1a7aaee31e71108
Auto-generated-cl: translation import
2015-04-01 02:46:18 -07:00
riddle_hsu
57307b21cb [ActivityManager] Improve multi-thread access the same provider
Application may use many threads to load data from provider.
If the target provider needs to start process, each access
will occupy one binder thread of system server until the
provider process started and published.

Sometimes application uses more than 16 threads to access
the same provider, and the provider process needs a little
long time to start, then all binder threads of system server
are waiting. But when the provider is ready, it is unable to
publish to notify those waiting threads because no availabe
binder thread to use. And device will become almost hang.

Improvement:
If there is already a thread acquiring provider, let other threads
(which try to acquire the same provider) wait the result of the
first one. That reduces IPC to save binder thread of system server.

Remove calling removeContentProvider in installProvider because
we have ensured only get one provider holder for the same provider,
the original race that gets a new useless holder will not happen.

Change-Id: I521f2603db8ced56912f5dc54342a70451e68381
2015-04-01 15:06:18 +08:00