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

91279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Hu
2ca3ae100f Merge "Update the location tracker test app" 2012-10-09 16:14:15 -07:00
Christopher Tate
cf32f96620 am fcd4db9b: am 711b4fca: am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 
* commit 'fcd4db9b8174b40a76f77bea73011c6470772465':
  Back up / restore the "Avoid poor connections" wifi setting
 2012-10-09 16:07:47 -07:00
Christopher Tate
fcd4db9b81 am 711b4fca: am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 
* commit '711b4fcadda2948b73e97f4ff3dc3e96b5316499':
  Back up / restore the "Avoid poor connections" wifi setting
 2012-10-09 16:05:25 -07:00
Christopher Tate
711b4fcadd am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 
* commit 'c9c47f821af22c6fae4c97fe185c6a651a6f9b67':
  Back up / restore the "Avoid poor connections" wifi setting
 2012-10-09 16:01:59 -07:00
Christopher Tate
c9c47f821a Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 2012-10-09 15:57:06 -07:00
Kenny Root
cde5343459 am 921d4455: am e8b90ef4: am a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev 
* commit '921d445584cabdc8bab29bfc4df8160e60ff55f9':
  Add fused location provider to real provider list
 2012-10-09 15:28:59 -07:00
Eino-Ville Talvala
d6c0c114b9 am c2b90f77: am 685a5128: am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 
* commit 'c2b90f77bd9c79e9437a1799140b1da215c949c6':
  Camera: Query AudioService for shutter sound enforcement.
 2012-10-09 15:28:55 -07:00
Christopher Tate
16eb7cd457 Back up / restore the "Avoid poor connections" wifi setting 
Bug 7318177

Change-Id: I8fdc037f823b8c57727e7d49c5bffdc9b3c10ebb
 2012-10-09 15:26:30 -07:00
Kenny Root
921d445584 am e8b90ef4: am a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev 
* commit 'e8b90ef442e3f2077b827d6657f8201d87a80cc8':
  Add fused location provider to real provider list
 2012-10-09 15:26:11 -07:00
Eino-Ville Talvala
c2b90f77bd am 685a5128: am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 
* commit '685a512868a7da11f7097282fd1a4a2af070d816':
  Camera: Query AudioService for shutter sound enforcement.
 2012-10-09 15:26:07 -07:00
Kenny Root
e8b90ef442 am a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev 
* commit 'a8a6b0848d1c11c3ed0fcb846e3d6c39b91536a0':
  Add fused location provider to real provider list
 2012-10-09 15:23:58 -07:00
Eino-Ville Talvala
685a512868 am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 
* commit 'cbdb21364653910179da1eddd43f4b932420b75b':
  Camera: Query AudioService for shutter sound enforcement.
 2012-10-09 15:23:54 -07:00
Kenny Root
a8a6b0848d Merge "Add fused location provider to real provider list" into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Eino-Ville Talvala
cbdb213646 Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Jim Miller
7079affa59 am 1d500220: am af5a45a7: am 74bc9b68: Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev 
* commit '1d500220014811b010671382a4669b93ec3dbaf3':
  Implement music and user priority scheme in keyguard
 2012-10-09 15:20:38 -07:00
Jim Miller
1d50022001 am af5a45a7: am 74bc9b68: Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev 
* commit 'af5a45a771f36c3ed6572c27d026818e1d8d1255':
  Implement music and user priority scheme in keyguard
 2012-10-09 15:17:57 -07:00
Jim Miller
af5a45a771 am 74bc9b68: Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev 
* commit '74bc9b68510d8e88fb1c806313aad3f35543202b':
  Implement music and user priority scheme in keyguard
 2012-10-09 15:15:13 -07:00
Jim Miller
74bc9b6851 Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev 2012-10-09 15:12:44 -07:00
rich cannings
490f8d0a5c am 8f022057: am dcecd6f3: am f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 
* commit '8f02205740e0522feb49ffdd88db86985f10799c':
  Fix verfication bypassed for adb installs
 2012-10-09 14:17:45 -07:00
rich cannings
8f02205740 am dcecd6f3: am f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 
* commit 'dcecd6f3b3e2f0021bf5668ded122214ec51f786':
  Fix verfication bypassed for adb installs
 2012-10-09 14:15:19 -07:00
rich cannings
dcecd6f3b3 am f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 
* commit 'f1b246ddfed6757180768eea080b80c1538333f3':
  Fix verfication bypassed for adb installs
 2012-10-09 14:13:13 -07:00
rich cannings
f1b246ddfe Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 2012-10-09 14:11:21 -07:00
Robert Greenwalt
bc733f6714 am 6f4fcc73: am b24373e0: am 64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 
* commit '6f4fcc73b4fe61cf1081f8aa2f660f46b17315ef':
  Add config resource to help ATT prepaid
 2012-10-09 13:36:51 -07:00
rich cannings
36070b414a Fix verfication bypassed for adb installs 
ADB installs appear as UserHandle.USER_ALL, and can only be performed by
UserHandle.USER_OWNER, so use the package verifier for UserHandle.USER_OWNER.
This returns a valid userId to call PackageManagerService.getPackageUid.

Bug: 7293091
Change-Id: I7a5497cfe5fa2e7aa804345cf9f507ec26a0db21
 2012-10-09 13:34:51 -07:00
Robert Greenwalt
6f4fcc73b4 am b24373e0: am 64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 
* commit 'b24373e04a767d81d2f58c1398495214ef181328':
  Add config resource to help ATT prepaid
 2012-10-09 13:34:07 -07:00
Adam Powell
68293b35dc am d338b977: am db380410: am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit 'd338b9775bd549bc9d7b2153e60432ac694701fa':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:32:38 -07:00
Robert Greenwalt
b24373e04a am 64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 
* commit '64cb35c078d58d9025d2f14b3674ca59f2e6d80b':
  Add config resource to help ATT prepaid
 2012-10-09 13:30:49 -07:00
Adam Powell
d338b9775b am db380410: am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit 'db38041002c6c9f297e8c8c1eade6471646045b2':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:29:38 -07:00
Robert Greenwalt
64cb35c078 Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 2012-10-09 13:27:45 -07:00
Adam Powell
db38041002 am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit '160621280d7eaba7eeddc183c4c11aa49d32e30e':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:27:42 -07:00
Adam Powell
160621280d Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 2012-10-09 13:25:12 -07:00
Kenny Root
c3575188c2 Add fused location provider to real provider list 
During testing it's possible to mock a location provider, but the fused
location provider wasn't being inserted into the "mRealProviders" map so
when the fused location provider was unmocked, it would disappear
permanently from the list until the next reboot.

Bug: 6949478
Change-Id: I4993aa7fbbd21cea16bdbf2722d637c909b1cd73
 2012-10-09 12:44:42 -07:00
Victoria Lease
35b9ec35e7 am 45e001a3: am 45bdc2c1: am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev 
* commit '45e001a3ceb456e8017784b700a645bb2efe4008':
  Multiuser love for LocationManager
 2012-10-09 12:29:46 -07:00
Victoria Lease
45e001a3ce am 45bdc2c1: am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev 
* commit '45bdc2c170d37ac4821423f28cda141687256ab2':
  Multiuser love for LocationManager
 2012-10-09 12:27:08 -07:00
Winson Chung
018e66d988 am 328ea320: am 5191ccb3: am e45c4e42: Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev 
* commit '328ea3207f8d3ab8b693ad949d99f050766ac055':
  Increasing timeout for screenshot chord in keyguard. (Bug 6941775)
 2012-10-09 12:25:43 -07:00
Victoria Lease
45bdc2c170 am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev 
* commit 'c0c0c0e612e1ccf1e55eb2a9338ddfff40d8d7f2':
  Multiuser love for LocationManager
 2012-10-09 12:24:42 -07:00
Winson Chung
328ea3207f am 5191ccb3: am e45c4e42: Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev 
* commit '5191ccb368599924686ab5a04bfb0ab64ad6f0ad':
  Increasing timeout for screenshot chord in keyguard. (Bug 6941775)
 2012-10-09 12:23:06 -07:00
Victoria Lease
c0c0c0e612 Merge "Multiuser love for LocationManager" into jb-mr1-dev 2012-10-09 12:22:03 -07:00
Winson Chung
5191ccb368 am e45c4e42: Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev 
* commit 'e45c4e42d26f13d2e405d1d87a665f5796cd1b6d':
  Increasing timeout for screenshot chord in keyguard. (Bug 6941775)
 2012-10-09 12:20:35 -07:00
Robert Greenwalt
901ac560ca Add config resource to help ATT prepaid 
bug:7306353
Change-Id: I8da9e7591ad5e28d5b319df11435333da44fb7d3
 2012-10-09 12:20:08 -07:00
Winson Chung
e45c4e42d2 Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev 2012-10-09 12:18:02 -07:00
Christopher Tate
a7f45d31f6 am 6e41d596: am b17fdf7b: am af3cd21b: Merge "New command line tool: "settings"" into jb-mr1-dev 
* commit '6e41d59665261ff015d73ee5180fa85b009dd41e':
  New command line tool: "settings"
 2012-10-09 11:51:17 -07:00
Robert Ly
4cabdf20aa am fb9d598d: am 261ba620: am 0f31450f: am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit 'fb9d598d9e95a9d3e0be8e1dee81ebb0986aee8e':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:49:38 -07:00
Christopher Tate
6e41d59665 am b17fdf7b: am af3cd21b: Merge "New command line tool: "settings"" into jb-mr1-dev 
* commit 'b17fdf7b512530647037a7805c175c36db1549d8':
  New command line tool: "settings"
 2012-10-09 11:48:55 -07:00
Robert Ly
fb9d598d9e am 261ba620: am 0f31450f: am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit '261ba6207398e7c91ab669f45083499fdc3d6434':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:47:15 -07:00
Christopher Tate
b17fdf7b51 am af3cd21b: Merge "New command line tool: "settings"" into jb-mr1-dev 
* commit 'af3cd21b08dd22d6ffd747c6314fd49fed3170a0':
  New command line tool: "settings"
 2012-10-09 11:46:28 -07:00
Robert Ly
261ba62073 am 0f31450f: am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit '0f31450fe059f4557ac285ea4ec0cd5122422ea1':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:44:49 -07:00
Christopher Tate
af3cd21b08 Merge "New command line tool: "settings"" into jb-mr1-dev 2012-10-09 11:43:56 -07:00
Robert Ly
0f31450fe0 am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit 'fba8b7f5963cb2bc15f06d83d986345978cc415e':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:42:14 -07:00
Robert Ly
fba8b7f596 am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit 'f19e4b420de65306f09c199829e7e06fe210e21d':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:40:34 -07:00