Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
63069cc985 Import translations. DO NOT MERGE 
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
 2015-03-04 05:56:33 -08:00
Geoff Mendal
3e938519e3 am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '80b9bd854365bf052db9572bcff0fedf74090ff5':
  Import translations. DO NOT MERGE
 2015-03-04 13:47:51 +00:00
Geoff Mendal
9773529730 am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2':
  Import translations. DO NOT MERGE
 2015-03-04 13:47:46 +00:00
Geoff Mendal
80b9bd8543 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-04 13:42:02 +00:00
Geoff Mendal
42796e97f6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-04 13:41:22 +00:00
Geoff Mendal
89a2b286ae am cba2873e: (-s ours) Import translations. DO NOT MERGE 
* commit 'cba2873edc7cba933484180109204839d68dce87':
  Import translations. DO NOT MERGE
 2015-03-04 13:37:36 +00:00
Geoff Mendal
2df38fd3f5 Import translations. DO NOT MERGE 
Change-Id: Ibbd6d3677d2e146de85bfc7130371546b31cb404
Auto-generated-cl: translation import
 2015-03-04 07:36:32 -06:00
Geoff Mendal
302132c379 Import translations. DO NOT MERGE 
Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693
Auto-generated-cl: translation import
 2015-03-04 05:35:11 -08:00
Geoff Mendal
cba2873edc Import translations. DO NOT MERGE 
Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b
Auto-generated-cl: translation import
 2015-03-04 05:29:01 -08:00
riddle_hsu
01eb7fa7f9 [ActivityManager] Skip receiver precisely. 
Symptom:
Report broadcast ANR on a dead process.

Detail and sample:
http://code.google.com/p/android/issues/detail?id=158329

Root cause:
app.curReceiver can only remember the last running.
If an application is both receiving FG and BG broadcast,
only one of queue can discard, the remain one will still
count as timeout.

Solution:
Select the skip-tartget-receiver by comparing the skipping app
to the first record of mOrderedBroadcasts of each broadcast queues.

Change-Id: Ic68d56f21b417a34f2d30d64ecfbed09c5e1764d
 2015-03-04 17:27:05 +08:00
Craig Mautner
5d3f00e38b am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev 
* commit '358188f5891f5645dbff4fd8cb1a3e7341371f74':
  Change ActivityView startActivity state sequence
 2015-03-03 21:08:45 +00:00
Dan Sandler
e163a645dd Avoid crashing on startup when policy forbids lockscreen camera. 
Bug: 19554426
Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
 2015-03-03 16:06:28 -05:00
Luan Nguyen
83026cf0ec docs: Add new partners to Wear index page 
bug: 19550254
Change-Id: If5f4722ff480e965cce998bd6383d3a2df0cfe0d
 2015-03-03 13:06:03 -08:00
Craig Mautner
358188f589 Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev 2015-03-03 21:03:29 +00:00
Eric Gilmore
00eefca280 Fixing broken link per b/19503824. 
Change-Id: I4140decb254cf9c9f0eadfce1a3897c240d640d9
 2015-03-03 12:10:19 -08:00
Craig Mautner
b916836e8d Change ActivityView startActivity state sequence 
Problems arise if an activity is started in an ActivityView when the
parent activity is not resumed. In particular the ActivityView can
be brought to the front in front of other activities that have been
started by the parent.

This change checks the state of the parent when the ActivityView is
starting and if it is not resumed, throws an Exception.

This change also removes the queueing up of Intents if the surface
does not exist when startActivity is called. Now, the owner of the
ActivityView is notified when the surface becomes available. If
startActivity is called before that notification an Exception will be
thrown.

Fixes bug 19147472.

Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244
 2015-03-03 10:15:21 -08:00
Nick Kralevich
59e06d3ab4 am 98fdff61: am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 
* commit '98fdff61dd651f52d36c0e88dcce8a04568b7cc7':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
 2015-03-03 17:08:50 +00:00
Nick Kralevich
98fdff61dd am 56fde9e7: Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 
* commit '56fde9e70ef850ca7e3f076e52567f5c75b5e7da':
  SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
 2015-03-03 17:02:22 +00:00
Nick Kralevich
56fde9e70e Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates." 2015-03-03 16:55:10 +00:00
Joe Fernandez
5864f5ed4b am 55902316: am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '559023163d7e9e0aad4846bc0fccfc5c28705ec7':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:48:21 +00:00
Joe Fernandez
559023163d am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '1137ca03be9b9143c472d9adc51ea511cfd68a6b':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:42:39 +00:00
Joe Fernandez
1137ca03be am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:36:02 +00:00
Joe Fernandez
246a3a4a79 am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:29:33 +00:00
Rich Slogar
e0a4a469ef am a08f2047: am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22 
* commit 'a08f2047025b741b6356d2bf0320da57eda7e2bc':
  docs: support library updates for sdk 22
 2015-03-03 06:25:27 +00:00
Joe Fernandez
14fcef3bf0 am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:22:42 +00:00
Rich Slogar
a08f204702 am 646c7cd6: am a81ed3cd: docs: support library updates for sdk 22 
* commit '646c7cd6e81904791b7ecc7ab7750ffe4919371b':
  docs: support library updates for sdk 22
 2015-03-03 06:18:54 +00:00
Joe Fernandez
c4418980a0 am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
 2015-03-03 06:15:29 +00:00
Rich Slogar
646c7cd6e8 am a81ed3cd: docs: support library updates for sdk 22 
* commit 'a81ed3cd0f73138832c8386ee66dcbf2b4dce928':
  docs: support library updates for sdk 22
 2015-03-03 06:13:41 +00:00
Joe Fernandez
a31378dc49 Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs 2015-03-03 06:11:50 +00:00
Rich Slogar
a81ed3cd0f docs: support library updates for sdk 22 
Change-Id: I4cb14e6c941652fe02d98ffac32451eea6f4576c
 2015-03-02 22:07:07 -08:00
Rich Slogar
6717c36f4a am 522f5aa5: am ad334de5: am e0ce0f2c: docs: platform revisions 5.1 
* commit '522f5aa55ae7dcdf3c011de92939ca901f548a8f':
  docs: platform revisions 5.1
 2015-03-03 03:19:26 +00:00
Rich Slogar
522f5aa55a am ad334de5: am e0ce0f2c: docs: platform revisions 5.1 
* commit 'ad334de54a89ab755ef16aebf47bb16e287782bc':
  docs: platform revisions 5.1
 2015-03-03 03:12:54 +00:00
Rich Slogar
ad334de54a am e0ce0f2c: docs: platform revisions 5.1 
* commit 'e0ce0f2cc28720316902303209f923e699d604f7':
  docs: platform revisions 5.1
 2015-03-03 03:06:48 +00:00
Rich Slogar
e0ce0f2cc2 docs: platform revisions 5.1 
Change-Id: Iabbd8617e3d334228fec94254160f2e43cdd22c6
 2015-03-02 18:55:44 -08:00
Selim Gurun
9205071093 am 545093df: am 75666e90: Merge "Revert "Add potential future APIs for postmessage"" 
* commit '545093df16ed2a94c1636ec8e8148574e6cad303':
  Revert "Add potential future APIs for postmessage"
 2015-03-03 02:28:48 +00:00
Joe Fernandez
647170d493 am a1dfb22a: am 8fe980e8: am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev 
* commit 'a1dfb22aac45db858378385aad48ab6995614626':
  Doc change: Add diff report for API 22.
 2015-03-03 02:21:09 +00:00
Selim Gurun
545093df16 am 75666e90: Merge "Revert "Add potential future APIs for postmessage"" 
* commit '75666e9054d97a9daecd5648f71414406413c6d9':
  Revert "Add potential future APIs for postmessage"
 2015-03-03 02:20:57 +00:00
Joe Fernandez
a1dfb22aac am 8fe980e8: am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev 
* commit '8fe980e803c6e20f799a12c08e54cadcbc39f6d1':
  Doc change: Add diff report for API 22.
 2015-03-03 02:14:32 +00:00
Selim Gurun
75666e9054 Merge "Revert "Add potential future APIs for postmessage"" 2015-03-03 02:14:19 +00:00
Joe Fernandez
8fe980e803 am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev 
* commit '546433328d0b017419bd3d5ff6ee5708645455db':
  Doc change: Add diff report for API 22.
 2015-03-03 02:07:29 +00:00
Joe Fernandez
546433328d Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev 2015-03-03 02:03:45 +00:00
Joe Fernandez
f76b6c988a am 66b4366e: am a2bbdb96: am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev 
* commit '66b4366e99f561766303e539d3ee798a0b8a2a09':
  docs: update Android docs build to include API 22, Android 5.1
 2015-03-03 02:00:51 +00:00
Joe Fernandez
66b4366e99 am a2bbdb96: am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev 
* commit 'a2bbdb96303c0fcac696ece07c27a49fbdd1f740':
  docs: update Android docs build to include API 22, Android 5.1
 2015-03-03 01:54:52 +00:00
Selim Gurun
49f9ad8e2a Revert "Add potential future APIs for postmessage" 
This reverts commit 37bd8907cb.

Change-Id: Iaa9356b95859846ce9c3209d3d1bcfc800d2ff93
 2015-03-03 01:54:25 +00:00
Joe Fernandez
a2bbdb9630 am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev 
* commit '2ba57444e8368ab66ae43fe2304e39dc76fc64ff':
  docs: update Android docs build to include API 22, Android 5.1
 2015-03-03 01:47:26 +00:00
Rich Slogar
e54ab91fff am 6d8b3b14: am 9b4a363d: am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '6d8b3b1418a764db42cd6d0929bf7829032d0f59':
  docs: sdk tools 24.1 update
 2015-03-03 01:47:15 +00:00
Joe Fernandez
2ba57444e8 Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev 2015-03-03 01:42:41 +00:00
Rich Slogar
6d8b3b1418 am 9b4a363d: am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '9b4a363d0d2043c009ce066ae99ddaf1054b5c8d':
  docs: sdk tools 24.1 update
 2015-03-03 01:40:42 +00:00
Miao Wang
5830e7a9fb am 411473de: am caa8a8fb: Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()." 
* commit '411473de4a558747b003f27190f61c75bf9e12c7':
  [Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom().
 2015-03-03 01:36:16 +00:00
Rich Slogar
9b4a363d0d am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '3f3f842cc06e0103041e7dae4c3f9fbf1f7ab9c0':
  docs: sdk tools 24.1 update
 2015-03-03 01:34:25 +00:00