drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,617 Commits 1 Branch 0 Tags
Commit Graph

105617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
d875468959 am c72949c6: am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit 'c72949c6bc6f5654f09482309d9d3ac03aadd67d':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:16:51 -07:00
Dirk Dougherty
a284e2013a Merge "Doc change: adjust description of NEW_OUTGOING_CALL." into jb-mr1.1-docs 2013-05-29 05:16:01 +00:00
Santos Cordon
c72949c6bc am 7999c228: am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '7999c22867c75f39214d8fa6d99ae61ec8aacc7a':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:15:39 -07:00
Santos Cordon
7999c22867 am 7fb15ce7: Update documentation of NEW_OUTGOING_CALL 
* commit '7fb15ce74bbc06c88660440f84845a1f3108c3d3':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-28 22:14:28 -07:00
Dave Burke
fbdb7d25de Fix up device sounds. 
Bug: 9179812
Change-Id: Ie86287487830c06f38bcc5c0e8bab3da225d6bbf
 2013-05-28 21:44:29 -07:00
Daniel Sandler
a1f49d8bb7 am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev 
* commit '295eddb92fd6e137ae352ea8dace2ecd18bf0a8a':
  Don't show emergency calls label unless it's a phone.
 2013-05-28 21:37:59 -07:00
Daniel Sandler
295eddb92f Merge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev 2013-05-29 04:36:24 +00:00
Robert Greenwalt
466ceb463f am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev 
* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd':
  Ignore outstanding delayed shutdown on restart
 2013-05-28 21:23:11 -07:00
Robert Greenwalt
aa4b2ee0d6 Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev 2013-05-29 04:21:25 +00:00
Baligh Uddin
e3425ac426 am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'af1e512e3f2b52e563e37c1635cbea06e87e0592':
  Import translations. DO NOT MERGE
 2013-05-28 20:44:52 -07:00
Baligh Uddin
af1e512e3f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-29 03:42:23 +00:00
Robert Greenwalt
e9868c1ba0 Ignore outstanding delayed shutdown on restart 
This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail.  Bug
is timing dependent and hard to repro.

bug:9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6
 2013-05-28 19:33:48 -07:00
Dirk Dougherty
367ce906c8 Doc change: adjust description of NEW_OUTGOING_CALL. 
Change-Id: If2bcfa7410759e08958029578a9b3d0a60a1de4e
 2013-05-28 17:59:38 -07:00
Jean-Michel Trivi
bb6f8711a7 Monitor device rotation 
If requested by ro.audio.monitorOrientation property, set orientation
 information as audio system parameter on configuration changes.

Bug 9095903

Change-Id: I669d4084eade3c14feb63f644bdd5b74fddc8857
 2013-05-28 17:33:16 -07:00
Andrew Hsieh
222ff39fe2 am 64b5f7cc: am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 
* commit '64b5f7cc4ca094754d4631ffb801b7bb771081ec':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
 2013-05-28 17:10:02 -07:00
Andrew Hsieh
64b5f7cc4c am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 
* commit '09377ddb93a964b9e0def6d84b8beb3a515f4a18':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
 2013-05-28 17:08:54 -07:00
Andrew Hsieh
09377ddb93 Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 2013-05-29 00:06:54 +00:00
Santos Cordon
7fb15ce74b Update documentation of NEW_OUTGOING_CALL 
Adds call-handling as a use case for NEW_OUTGOING_CALL

Change-Id: Ie511438bd8d9aa245881f050d32221c81e898745
 2013-05-28 16:00:11 -07:00
Jeff Sharkey
2c4b090551 am ab4a0541: am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 
* commit 'ab4a0541994d5de9520ad4ba37c3a11c5f540eb5':
  Add missing ACTION_MEDIA_UNMOUNTED intent
 2013-05-28 15:49:16 -07:00
Jeff Brown
c8a7773562 am dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit 'dea6e86dce716b67fe92c9b281fe9e79256f3b78':
  Bug fix for building the hover target list
 2013-05-28 15:49:13 -07:00
Jeff Sharkey
ab4a054199 am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 
* commit 'e4c29de9c69d332d65d2eb490961faffab4467fd':
  Add missing ACTION_MEDIA_UNMOUNTED intent
 2013-05-28 15:46:08 -07:00
Jeff Brown
dea6e86dce am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit '3422ceb6ba453c28ac39dfce34534e0346394a3a':
  Bug fix for building the hover target list
 2013-05-28 15:46:00 -07:00
Jeff Brown
ef0c3e269f am c8c82009: resolved conflicts for merge of 7573e594 to stage-aosp-master 
* commit 'c8c82009dc8c146efadac6b51702922148f6003f':
  Properly rotate full [-pi, +pi] orientation range if available
 2013-05-28 15:45:43 -07:00
Jeff Brown
c8c82009dc resolved conflicts for merge of 7573e594 to stage-aosp-master 
Change-Id: Ic19294c82ec023707e23b5848901426433b22e9f
 2013-05-28 15:43:16 -07:00
Jason Noguchi
c6cedc84f4 Refactor of camera stress test to add camera test helper. Also add 
additional functional tests for: flash, exposure, white balance, and
focus mode.  Also add pairwise tests.

Slight refactor to add camera test helper and also additional
tests for: flash, exposure, white balance, and focus mode

Bug: 9174937

Change-Id: I3d26b545dc8ff972c8173066df59a2e572a837ef
 2013-05-28 15:28:32 -07:00
Matthew Xie
90ca807f7b Revert "Revert "Change GATT_FAILURE from 0 to 0x101"" 
This reverts commit d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
 2013-05-28 15:28:24 -07:00
Maunik Shah
46c94b6626 DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition 
Fix for the synchronization issue leading to access of an array
Index out of bounds. Issue occurs due to race condition between
removing the activities of a crashed process from history stack
and resuming a separate activity.

Change-Id: I14bb5834e778c15b674248e46fe93b0ce9f37967
 2013-05-28 13:46:24 -07:00
Jeff Sharkey
e4c29de9c6 Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 2013-05-28 20:44:47 +00:00
Daniel Sandler
8b268d461b Don't show emergency calls label unless it's a phone. 
Bug: 9042105
Change-Id: I8ffb6a66851878cdf22be9a20dbf57f5b6b48002
 2013-05-28 16:17:13 -04:00
Jeff Brown
3422ceb6ba Merge "Bug fix for building the hover target list" 2013-05-28 20:04:23 +00:00
Jeff Brown
dcb8d87658 am 79df1e65: am e2a281ca: Merge "Add additional Method that check whether a table is empty or not" 
* commit '79df1e65455fdb69f07675cffae99dea06a5afb2':
  Add additional Method that check whether a table is empty or not
 2013-05-28 13:00:28 -07:00
Jeff Brown
79df1e6545 am e2a281ca: Merge "Add additional Method that check whether a table is empty or not" 
* commit 'e2a281ca85f17eaf6d47978c76d2cafb0fa81782':
  Add additional Method that check whether a table is empty or not
 2013-05-28 12:57:59 -07:00
Jeff Brown
7573e5947a Merge "Properly rotate full [-pi, +pi] orientation range if available" 2013-05-28 19:56:20 +00:00
Jeff Brown
e2a281ca85 Merge "Add additional Method that check whether a table is empty or not" 2013-05-28 19:55:26 +00:00
Scott Main
2ee100c099 am e0329cae: am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit 'e0329cae82dac7a650d505f9baafbd98e511e339':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:51:08 -07:00
Scott Main
e0329cae82 am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '5bd6794468df7f7900f1e0a37c24653dd524a5c8':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:49:25 -07:00
Scott Main
5bd6794468 am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '5fbe17fe2a5804a613c3e9d72d555a0aae8ba618':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:45:25 -07:00
Scott Main
5fbe17fe2a am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '27ab718e7ca00092acab7f55fed1a5dea9a7a77b':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:43:50 -07:00
Scott Main
27ab718e7c Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 2013-05-28 18:41:37 +00:00
Joe Malin
ba0256fdc5 Docs bug fix: B9085293 - Stop Location Updates 
Change-Id: I8dd9e6ca59bac628ba834a86f50783170964e652
 2013-05-28 10:50:58 -07:00
John Spurlock
be7a7e546f am ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev 
* commit 'ee352cca1f3beb577dfdf1c18a08242e4f94d01b':
  Fix typo in View.java javadocs
 2013-05-28 09:36:19 -07:00
John Spurlock
ee352cca1f Merge "Fix typo in View.java javadocs" into jb-mr2-dev 2013-05-28 16:33:49 +00:00
Scott Main
1a4022c8a6 am 0e11e8ef: am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '0e11e8ef4bb6472b8e8a1b4b76b4b7c195aaffe1':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 09:08:02 -07:00
Scott Main
0e11e8ef4b am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '6e5ee7ddf2cc948ef3b69a73f25ce81f7edd76e9':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 09:03:37 -07:00
Scott Main
a0ac0f15cd am 597a8374: am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit '597a8374491ffb9dc5c07fadfccd9c1b1b336046':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 09:01:10 -07:00
Scott Main
6e5ee7ddf2 am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit 'ea32597832aada5f811c9ca1c1baf008d62ab64a':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 09:00:51 -07:00
Scott Main
597a837449 am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'afaff6e2e90e61df52737fec9e059b05cfa71e48':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:59:09 -07:00
Scott Main
ea32597832 am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '005d2afb308f474352ec4b504cf661851e4c2e59':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 08:58:18 -07:00
Scott Main
afaff6e2e9 am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'fb22f9cb04d13fb85f1b3fd0e979742b5ab6568d':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:57:27 -07:00
Scott Main
005d2afb30 Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 2013-05-28 15:56:24 +00:00