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

79679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
e102b8168a am 4123b46f: Merge "Doc change: updated numbers for Andriod. Fix gcm image path." into jb-dev 
* commit '4123b46f0e4146cb181b53af476e34bfede7d1ec':
  Doc change: updated numbers for Andriod. Fix gcm image path.
 2012-07-02 15:59:26 -07:00
Dirk Dougherty
4123b46f0e Merge "Doc change: updated numbers for Andriod. Fix gcm image path." into jb-dev 2012-07-02 15:56:49 -07:00
Dirk Dougherty
24a3242029 Doc change: updated numbers for Andriod. Fix gcm image path. 
Change-Id: Ia3b43f9464938b9775ee6f77c850af37fac9117f
 2012-07-02 15:52:25 -07:00
Jean-Baptiste Queru
e39d42db00 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:48 -07:00
Jean-Baptiste Queru
5709f43dd8 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:44 -07:00
Jean-Baptiste Queru
3cd92d8faa Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:38 -07:00
Jean-Baptiste Queru
df0dded1e7 Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:33 -07:00
Jean-Baptiste Queru
2a2d5e0b31 Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:28 -07:00
Jean-Baptiste Queru
1fe7a81383 Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:19 -07:00
Eric Fischer
82b141e267 am c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c70ec659e8f63b31e11f5f0a82c638261d67056e':
  Import translations. DO NOT MERGE
 2012-07-02 14:09:49 -07:00
Eric Fischer
c70ec659e8 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-02 14:07:11 -07:00
John Huang
5045dd6029 am 46c923af: Merge "Fix country code for Netherlands Antilles." into jb-dev 
* commit '46c923afd50741c8d185a6d0c7666a86c9dfe712':
  Fix country code for Netherlands Antilles.
 2012-07-02 12:55:01 -07:00
John Huang
46c923afd5 Merge "Fix country code for Netherlands Antilles." into jb-dev 2012-07-02 12:52:29 -07:00
Jean-Baptiste Queru
7ebd4bae74 Revert "DO NOT MERGE: Remove SMS shortcode warning feature." 
This reverts commit 004ff5ad2aa02daff607bcf1712f3efbb84c58ca.
 2012-07-02 12:36:47 -07:00
Scott Main
4faac02a1d am 0dc12ee0: Merge "docs: new dashboard stats for 7/2" into jb-dev 
* commit '0dc12ee0f1cde86522724f176ed5a6d62142c47d':
  docs: new dashboard stats for 7/2
 2012-07-02 12:36:14 -07:00
Scott Main
0dc12ee0f1 Merge "docs: new dashboard stats for 7/2" into jb-dev 2012-07-02 12:33:03 -07:00
Jean-Baptiste Queru
a02bce1d5b Revert "DO NOT MERGE: Remove SMS shortcode warning feature." 
This reverts commit b1fc08ca082db8ecad54c792485ff7915e3513ce.
 2012-07-02 12:30:32 -07:00
Wink Saville
829edb8a53 Fix country code for Netherlands Antilles. 
Change the cc to "ai" from "nl" otherwise the timezone is
set to Netherlands which is +1 rather than the Caribbean
which is -4.

Bug: 6765706
Change-Id: Ie399efe95ce93b73eb4e60cfc47e621cce85e6e5
 2012-07-02 12:26:21 -07:00
Eric Fischer
a2b17b8895 Import translations. DO NOT MERGE 
Change-Id: I5eae952127a0af6618ab96065cd50d78bbaea189
Auto-generated-cl: translation import
 2012-07-02 12:25:39 -07:00
Scott Main
6039f148f2 docs: new dashboard stats for 7/2 
Change-Id: I29cdbbc9ef11ccd6398613b8dce8e25ab406318f
 2012-07-02 12:23:52 -07:00
Dirk Dougherty
e030c61a72 am 73d90e79: Merge "Doc change: fix incorrect links to dashboard." into jb-dev 
* commit '73d90e797bf52b52372314477553b140818717c9':
  Doc change: fix incorrect links to dashboard.
 2012-07-02 11:18:38 -07:00
Dirk Dougherty
73d90e797b Merge "Doc change: fix incorrect links to dashboard." into jb-dev 2012-07-02 11:15:29 -07:00
Dirk Dougherty
e8ee48ea9f am 418203d1: Doc change: Add Google Play balance back into monetizing docs. 
* commit '418203d1d57d9aca455e84b6a4e6bee8a000fdd6':
  Doc change: Add Google Play balance back into monetizing docs.
 2012-07-02 11:07:20 -07:00
Dirk Dougherty
63cb3d474f Doc change: fix incorrect links to dashboard. 
Change-Id: I31c754aa036b0770c7cd8596594bb2cedd47f1a7
 2012-07-02 11:05:55 -07:00
Dirk Dougherty
418203d1d5 Doc change: Add Google Play balance back into monetizing docs. 
Change-Id: I4326cbd7b93f0429b34f56f7ad67d910bcb0c6e1
 2012-07-02 11:03:31 -07:00
Santos Cordon
53149fd1eb Fix a bad comment. - DO NOT MERGE 
Change-Id: I923fb003cc37f562ff6cc5a4cdcc8dd4ea227dc0
 2012-07-02 10:57:31 -07:00
Santos Cordon
992a57bf39 Telephony Capability-Distinguish dialing & connect - DO NOT MERGE 
New capability returns true if the device can distinguish between
dialing/active and connected reliably. Currently returns true only for
GSM phones.

Change-Id: I50751abaf74b31fdc747f4d04ca9a2ac4d73a1ff
 2012-07-02 10:57:25 -07:00
Wink Saville
2686b058cd When we disconnect shutdown the StateMachine. DO NOT MERGE 
Need to stop the StateMachine threads and release
all resources when we disconnect.

bug: 6342470
Change-Id: Ibf7a2ebf4f7ecd667c5d95579e66ecd5086103ea
 2012-07-02 10:57:16 -07:00
Wink Saville
095c58b73a Enhance StateMachine Quitting and logging support. DO NOT MERGE 
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.

bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7

Conflicts:

	services/java/com/android/server/NsdService.java
 2012-07-02 10:57:11 -07:00
The Android Open Source Project
f632562f7d Reconcile with jb-release 
Change-Id: I815e9292c3078eddde37ede41876d9219e4e2784
 2012-06-29 18:28:24 -07:00
Siva Velusamy
4fae0620ce am 27ad058a: Merge "Fix Minor typos" into jb-dev 
* commit '27ad058a941e742bc519b76d3a7940f31f988f1f':
  Fix Minor typos
 2012-06-29 18:13:14 -07:00
Siva Velusamy
27ad058a94 Merge "Fix Minor typos" into jb-dev 2012-06-29 18:10:29 -07:00
Ying Wang
6979f52208 am 2612de14: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '2612de14d2dcfd5a6eedf882cf5cd9ac3e6fb73a':
  Import translations. DO NOT MERGE
 2012-06-29 17:53:20 -07:00
Ying Wang
2612de14d2 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-29 17:50:47 -07:00
Siva Velusamy
4605a039ec Fix Minor typos 
Change-Id: I6d0581b7f3dcf1aad7ef3a622a750b8cbba221d5
 2012-06-29 17:49:55 -07:00
Scott Main
861b074fb4 am e02e5d8d: docs: fix link to gcm 
* commit 'e02e5d8d5874d9b247b3dff9153b7c9802f60130':
  docs: fix link to gcm
 2012-06-29 16:50:05 -07:00
Scott Main
e02e5d8d58 docs: fix link to gcm 
Change-Id: If198e72f1c3a37c82fe782ec88dd6a0c98e17105
 2012-06-29 16:45:55 -07:00
Scott Main
8d37456987 am ef2b7fa2: Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev 
* commit 'ef2b7fa2c311b91108a6a7296e004e89bc87fa9c':
  docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs.
 2012-06-29 16:28:48 -07:00
Scott Main
ef2b7fa2c3 Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev 2012-06-29 16:26:19 -07:00
Scott Main
6775696412 am f0d68a97: Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev 
* commit 'f0d68a975fc4cf0e43c94f1678a311b2ed201c92':
  docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877
 2012-06-29 16:22:42 -07:00
Scott Main
64b1188356 docs: move FAQ and old notepad tutorial to other places where we can properly redirect. 
This way the docs are accessible from existing links and they at least appear with a sidenav
Also resolve a bunch of links to the notepad docs.

Change-Id: I828e0bb8df32ee5658cae22c8f34b9fc1512fbae
 2012-06-29 16:21:51 -07:00
Scott Main
f0d68a975f Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev 2012-06-29 16:19:52 -07:00
The Android Automerger
5df368fac7 merge in jb-release history after reset to jb-dev 2012-06-29 15:51:56 -07:00
Dianne Hackborn
a9c3846194 am bfb752f8: Merge "Fix issue #6761130: Clearing app data in settings does not clear app\'s USB storage" into jb-dev 
* commit 'bfb752f8f0e4d73dc251c19d2ef79649fbbe4fd1':
  Fix issue #6761130: Clearing app data in settings does not clear app's USB storage
 2012-06-29 15:43:37 -07:00
Dianne Hackborn
bfb752f8f0 Merge "Fix issue #6761130: Clearing app data in settings does not clear app's USB storage" into jb-dev 2012-06-29 15:40:18 -07:00
Joe Fernandez
79dee590a8 docs: Google IO bug fixes 
- http://b.corp.google.com/issue?id=6756248
- http://code.google.com/p/android/issues/detail?id=33877

Change-Id: Ib77bb865d7a5f8194ce8a1bac59c15612a3dc654
 2012-06-29 15:22:38 -07:00
Dianne Hackborn
183ce028f1 Fix issue #6761130: Clearing app data in settings does not clear app's USB storage 
The package manager calls to clear data / clear cache were not also
having default container service clear the data on external storage.  Now
they do.

Change-Id: Ib5e5eb6adf2cac5a4cc094cc1a02ac8cfb6a2edf
 2012-06-29 15:00:21 -07:00
Christopher Tate
b69c77cd19 am 1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev 
* commit '1598a50818b638d20120f71bab01c1792ecd4b6a':
  Do not back up / restore the rotation-related settings
 2012-06-29 12:42:52 -07:00
Christopher Tate
1598a50818 Merge "Do not back up / restore the rotation-related settings" into jb-dev 2012-06-29 12:40:34 -07:00
Christopher Tate
596e1917d5 Do not back up / restore the rotation-related settings 
Change-Id: I4c5f8c31fa78acc1dfa2676e89b2c1c7bbd12a06
 2012-06-29 11:55:02 -07:00