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

88630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
a96ae6ebea am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev 
* commit '58b4cc4d2206ba0df9ed0931f1acce2058c5acea':
  Read in the disable-keyguard-features flag from the XML file
 2012-10-04 11:59:59 -07:00
Amith Yamasani
ac6c4cbb6c am 0cf4c3d4: am 3364b2ff: Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev 
* commit '0cf4c3d4a05f68b27895a527af158c976cfc9975':
  Fix launching home when there are multiple launchers installed
 2012-10-04 11:59:55 -07:00
Amith Yamasani
58b4cc4d22 am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev 
* commit 'dcf5a663cdec5ed1aa6b5d583cdac177a0974fcb':
  Read in the disable-keyguard-features flag from the XML file
 2012-10-04 11:58:11 -07:00
Amith Yamasani
0cf4c3d4a0 am 3364b2ff: Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev 
* commit '3364b2ff7970bea9013b53554caf98c2d5f783ed':
  Fix launching home when there are multiple launchers installed
 2012-10-04 11:58:07 -07:00
Scott Main
1723bc812c am 64070e53: am 2babbe19: am c3b8a9b6: am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev 
* commit '64070e53353f663f3c7a1638a6fe594e54f29397':
  Doc update: TTL change.
 2012-10-04 11:57:16 -07:00
Amith Yamasani
dcf5a663cd Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev 2012-10-04 11:56:29 -07:00
Scott Main
64070e5335 am 2babbe19: am c3b8a9b6: am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev 
* commit '2babbe19a369b940bb25a8ca1bea0d3037bffd46':
  Doc update: TTL change.
 2012-10-04 11:55:28 -07:00
Amith Yamasani
3364b2ff79 Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev 2012-10-04 11:55:28 -07:00
Scott Main
2babbe19a3 am c3b8a9b6: am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev 
* commit 'c3b8a9b6d03283c77d179e1f6293a6319c91e6e6':
  Doc update: TTL change.
 2012-10-04 11:52:41 -07:00
Scott Main
c3b8a9b6d0 am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev 
* commit 'bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a':
  Doc update: TTL change.
 2012-10-04 11:50:18 -07:00
Scott Main
bc7a20a48c resolved conflicts for merge of 78866b71 to jb-dev 
Change-Id: I028637f4622f398769ad43e714d45ec95ff3f23d
 2012-10-04 11:39:00 -07:00
Baligh Uddin
73646da5e5 am 5dba4eaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '5dba4eaa547e04a547593e29f406de8394a24b93':
  Import translations. DO NOT MERGE
 2012-10-04 11:31:50 -07:00
Baligh Uddin
5dba4eaa54 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 11:29:39 -07:00
Victoria Lease
51a0daa522 am f9d5a079: am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev 
* commit 'f9d5a079c58a540c307cfe3a2dedb3e8bbd8513d':
  throw SecurityException in isProviderEnabled()
 2012-10-04 11:22:44 -07:00
Victoria Lease
f9d5a079c5 am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev 
* commit '18c2b6e730f6d639421e45328f4fb2514683efe5':
  throw SecurityException in isProviderEnabled()
 2012-10-04 11:20:55 -07:00
Victoria Lease
18c2b6e730 Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev 2012-10-04 11:18:14 -07:00
Baligh Uddin
4b1759d3aa am a12f3478: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a12f347895a8686af3b5d18a2cf1ec2017db8124':
  Import translations. DO NOT MERGE
 2012-10-04 11:06:57 -07:00
Baligh Uddin
a12f347895 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 11:05:07 -07:00
Amith Yamasani
7077b3c9bb Read in the disable-keyguard-features flag from the XML file 
Bug: 7283501 Exchange Services crash while using Email App after upgrading
Change-Id: I40d13f5d3805ea3139dc3938077a5265ff78c426
 2012-10-04 11:00:55 -07:00
Baligh Uddin
dc56aa51cd am b34b85a1: am b3f55fde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b34b85a1ef418571365b1b03c25d0d5b4177c1a5':
  Import translations. DO NOT MERGE
 2012-10-04 11:00:07 -07:00
Baligh Uddin
fad961d39d am ed099251: (-s ours) am ceb4a21e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ed099251c9dc6adde28c84c548728ad7bae2ba9b':
  Import translations. DO NOT MERGE
 2012-10-04 11:00:07 -07:00
Baligh Uddin
b34b85a1ef am b3f55fde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b3f55fdef6659b836d97e6859e89a9427b97cc67':
  Import translations. DO NOT MERGE
 2012-10-04 10:58:26 -07:00
Baligh Uddin
ed099251c9 am ceb4a21e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ceb4a21e7257d5e39126f3e5290b2e1448a84532':
  Import translations. DO NOT MERGE
 2012-10-04 10:56:47 -07:00
Baligh Uddin
b3f55fdef6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:55:33 -07:00
Baligh Uddin
ceb4a21e72 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:54:18 -07:00
Scott Main
78866b71e6 Merge "Doc update: TTL change." into jb-dev-docs 2012-10-04 10:20:13 -07:00
Scott Main
33c7440224 am f7040ded: am 68e11d40: am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit 'f7040dedbd61815b99c9597b13df5f999ecf6f41':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:15:45 -07:00
Scott Main
f7040dedbd am 68e11d40: am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit '68e11d40add775fd4ecafb0ca805d83a7f5f9d7d':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:13:34 -07:00
Scott Main
68e11d40ad am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit '70e6cff9bcd464fcb22a0d7dc977863ef0952448':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:12:16 -07:00
Scott Main
70e6cff9bc am 6b962174: am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit '6b962174bf974edd5298a37498777780e0b7b1fe':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:10:21 -07:00
Scott Main
6b962174bf am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 
* commit 'cea1f19cb85c8204cc920bb1073c0726b610cedd':
  add links from various design docs to corresponding developer docs
 2012-10-04 10:08:00 -07:00
Scott Main
cea1f19cb8 Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs 2012-10-04 10:06:02 -07:00
John Spurlock
4ab6d62c35 am 220b7d0e: am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev 
* commit '220b7d0ee221b2517189e0fc4c60c77e162b9b36':
  Clear notifications properly on ACTION_USER_STOPPED.
 2012-10-04 09:12:55 -07:00
John Spurlock
220b7d0ee2 am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev 
* commit '1205d16e020beeb16f05e0d788fdf7ed478623f6':
  Clear notifications properly on ACTION_USER_STOPPED.
 2012-10-04 09:11:17 -07:00
John Spurlock
1205d16e02 Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev 2012-10-04 09:09:15 -07:00
John Spurlock
078a490c22 Clear notifications properly on ACTION_USER_STOPPED. 
Which also takes care of the ACTION_USER_REMOVED case.

Bug:7277853
Change-Id: I0a6bade11bd0d420df03e16e69a386cfccfa07cc
 2012-10-04 12:00:53 -04:00
Eric Laurent
be535fc867 am d860ab4a: am 31fed737: Merge "AudioService: filter flags in volume methods" into jb-mr1-dev 
* commit 'd860ab4a22ee6f95238b64e1f4d280bc7b27e665':
  AudioService: filter flags in volume methods
 2012-10-04 08:49:00 -07:00
Eric Laurent
d860ab4a22 am 31fed737: Merge "AudioService: filter flags in volume methods" into jb-mr1-dev 
* commit '31fed73701041cd5455942abe2dacfc7639c5370':
  AudioService: filter flags in volume methods
 2012-10-04 08:46:34 -07:00
Eric Laurent
31fed73701 Merge "AudioService: filter flags in volume methods" into jb-mr1-dev 2012-10-04 08:44:26 -07:00
Victoria Lease
f429921e3a throw SecurityException in isProviderEnabled() 
In MR0, we did not allow applications to query enabled status of
location providers they did not have permission to use. Some
applications counted on this behavior, using the thrown
SecurityException to determine whether or not they have permission
to use the specified provider.

Reverting to this behavior fixes the regressions seen in those
applications.

Bug: 7251459
Change-Id: I8b0cfd5862c80f0c831a4ab544c3fa7408bc84a0
 2012-10-04 08:01:19 -07:00
The Android Open Source Project
9fcc8aed74 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ib34310d4da36e31c2a89ea767a8bb126973bffeb
 2012-10-04 07:48:11 -07:00
The Android Automerger
cd54ca7dc3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 06:59:39 -07:00
Chris Wren
7ee2f9d90e am 02065846: am 6295ef32: Merge "hide the redundant clock when the notification shade is open." into jb-mr1-dev 
* commit '02065846fa7cceae0cdfe65cf88a6d7f7741f8d4':
  hide the redundant clock when the notification shade is open.
 2012-10-04 06:41:54 -07:00
Chris Wren
02065846fa am 6295ef32: Merge "hide the redundant clock when the notification shade is open." into jb-mr1-dev 
* commit '6295ef325102bed3d12e54020acb8728bc2976a0':
  hide the redundant clock when the notification shade is open.
 2012-10-04 06:39:28 -07:00
Chris Wren
6295ef3251 Merge "hide the redundant clock when the notification shade is open." into jb-mr1-dev 2012-10-04 06:37:11 -07:00
Satoshi Kataoka
580bb919ed am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev 
* commit 'faf45d2525bf64fa7f484cde9180c448fd0e0345':
  Close the current input method when attached view doesn't have a handler
 2012-10-03 21:06:57 -07:00
Satoshi Kataoka
faf45d2525 am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev 
* commit 'ebf7e2851cab55348153fca299c52042b125924d':
  Close the current input method when attached view doesn't have a handler
 2012-10-03 21:05:12 -07:00
Satoshi Kataoka
ebf7e2851c Merge "Close the current input method when attached view doesn't have a handler" into jb-mr1-dev 2012-10-03 21:02:20 -07:00
Scott Main
d4cc942996 add links from various design docs to corresponding developer docs 
Change-Id: Id731979a9b6ebcfc956848933d64ea5cf64953b5
 2012-10-03 20:53:05 -07:00
Jim Miller
9b8c009510 am c2cb3c2f: am 5b14b969: Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev 
* commit 'c2cb3c2f3cc50a9d583b970cf85978ba36b97d63':
  Fix keyguard landscape layout on phones
 2012-10-03 20:34:07 -07:00