Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,848 Commits 3 Branches 0 Tags
8edf64e9e903f2dcd54d52b74ef1bbfefcbbca3d
Commit Graph

163848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Gilmore
8edf64e9e9 am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '28d11557d6846e7ea7fb2593a6ed4d3a16f5eef6':
  Fixing broken link per b/19503824.
 2015-03-05 01:02:55 +00:00
Eric Gilmore
28d11557d6 am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '498691d2641deb1ca30938c7777a9a63882ffd87':
  Fixing broken link per b/19503824.
 2015-03-05 00:55:38 +00:00
Bart Sears
5a1cec86cf am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev 
* commit '0c3052a6675ed528c2898bd2ecb92576bca78df9':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-03-05 00:52:58 +00:00
Eric Gilmore
498691d264 am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '62777b189dc31c250c4ae06915aae0a337950e1c':
  Fixing broken link per b/19503824.
 2015-03-05 00:49:21 +00:00
Bart Sears
0c3052a667 am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev 
* commit '4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-03-05 00:40:13 +00:00
Bart Sears
4eedccebb7 Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev 2015-03-05 00:35:08 +00:00
Tucker Sylvestro
5a6b44c435 Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev 2015-03-05 00:15:08 +00:00
John Spurlock
bd43874287 am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE. 
* commit 'b879e7395fa9446952b840b1d576ff225b039774':
  MediaProjectionPermissionActivity: Fix NPE.
 2015-03-04 23:09:19 +00:00
John Spurlock
b879e7395f am c974ac11: MediaProjectionPermissionActivity: Fix NPE. 
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
  MediaProjectionPermissionActivity: Fix NPE.
 2015-03-04 23:01:26 +00:00
Andre Eisenbach
a0eaaa2a22 DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4) 
Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
 2015-03-04 17:17:20 -05:00
John Spurlock
c974ac11f8 MediaProjectionPermissionActivity: Fix NPE. 
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67)
 2015-03-04 18:58:18 +00:00
Craig Mautner
bbd2ac5adf Merge commit '83a63bac' into manualmerge 2015-03-04 10:10:34 -08:00
Eric Gilmore
62777b189d am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
  Fixing broken link per b/19503824.
 2015-03-04 17:53:31 +00:00
Eric Gilmore
5c30adfdb6 am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
  Fixing broken link per b/19503824.
 2015-03-04 17:47:01 +00:00
Eric Gilmore
22d1c1ce1d Merge "Fixing broken link per b/19503824." into lmp-docs 2015-03-04 17:40:16 +00:00
Craig Mautner
83a63bac5d am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev 
* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-03-04 16:15:35 +00:00
Craig Mautner
8fa394fa8c Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev 2015-03-04 16:09:29 +00:00
Geoff Mendal
b214417a6e am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3b9e64f3265ad146da1b9f5b523c406acd041f59':
  Import translations. DO NOT MERGE
 2015-03-04 14:08:11 +00:00
Geoff Mendal
bb9360e36c am 63069cc9: (-s ours) Import translations. DO NOT MERGE 
* commit '63069cc985869fe06254e352ea63b361cb0d0917':
  Import translations. DO NOT MERGE
 2015-03-04 14:08:03 +00:00
Geoff Mendal
3b9e64f326 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-04 14:04:04 +00:00
Geoff Mendal
c70510298e Import translations. DO NOT MERGE 
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
 2015-03-04 06:02:36 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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