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

105374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
fb4f2890e8 am 4c6f2a54: am 7a4ddbaa: Merge "Don\'t attempt native crash reporting for persistent apps" into jb-mr2-dev 
* commit '4c6f2a54109c3f75deca1f2b43736dcd9c965768':
  Don't attempt native crash reporting for persistent apps
 2013-04-23 04:46:20 -07:00
kmccormick
07ff1d1307 am 7fccb942: am 47cccbd0: am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit '7fccb94248514fc1037985330e6f4f0b0cc5ce3f':
  Doc update: Fix firewall text.
 2013-04-23 04:46:17 -07:00
Scott Main
f712987a4c am 5ced567d: am 3fadd4c2: am 8841569f: am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit '5ced567d768ae68796e017a2e1e5e72f7f22fef3':
  fix backup registration url external bug: 54539
 2013-04-23 04:46:15 -07:00
Baligh Uddin
7f289ae3bf am 1aaef016: am b0579834: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '1aaef016fade071b7bd61763bf4ffb5a2b853713':
  Import translations. DO NOT MERGE
 2013-04-23 04:46:12 -07:00
Dianne Hackborn
53ac712a80 am e89dcf33: am 3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev 
* commit 'e89dcf33e12ee9d57636adf1ccc37aca44d3c311':
  Assign final resource IDs for JB MR2.
 2013-04-23 04:46:09 -07:00
Scott Main
522de2c771 am c87dd640: am 9753ef1e: am 35ac5b08: am abb6f472: am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit 'c87dd6409253b4dfdc90c9d4f053f4c508d8cdfa':
  delete unused download page and add a couple search tags
 2013-04-23 04:46:06 -07:00
Zhentao Sun
c11a7e614c am 04375db6: am c5fc9988: Made it easier to disable overlay mechanism of location components. 
* commit '04375db65302fabcf7101ecc4e1e6e38700baba5':
  Made it easier to disable overlay mechanism of location components.
 2013-04-23 04:46:03 -07:00
Christopher Tate
4c6f2a5410 am 7a4ddbaa: Merge "Don\'t attempt native crash reporting for persistent apps" into jb-mr2-dev 
* commit '7a4ddbaafa9e11e190764ca0314f56651dfcb0d9':
  Don't attempt native crash reporting for persistent apps
 2013-04-23 03:50:46 -07:00
kmccormick
7fccb94248 am 47cccbd0: am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit '47cccbd09d4fe2f408bf88c39faa7530d202c233':
  Doc update: Fix firewall text.
 2013-04-23 03:50:44 -07:00
Scott Main
5ced567d76 am 3fadd4c2: am 8841569f: am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit '3fadd4c256f2f83b44cd023d4f6c95af8aeaadc0':
  fix backup registration url external bug: 54539
 2013-04-23 03:50:42 -07:00
Baligh Uddin
1aaef016fa am b0579834: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'b0579834e7af8239b10b7f2ec8b09e62f9ad51e1':
  Import translations. DO NOT MERGE
 2013-04-23 03:50:38 -07:00
Dianne Hackborn
e89dcf33e1 am 3edf207a: Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev 
* commit '3edf207a922c24df349e6f9ffadb2bdc5b18d3c2':
  Assign final resource IDs for JB MR2.
 2013-04-23 03:50:33 -07:00
Scott Main
c87dd64092 am 9753ef1e: am 35ac5b08: am abb6f472: am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit '9753ef1e7db65a3245c4a3c619b0778fd5e5a2de':
  delete unused download page and add a couple search tags
 2013-04-23 03:50:26 -07:00
Zhentao Sun
04375db653 am c5fc9988: Made it easier to disable overlay mechanism of location components. 
* commit 'c5fc9988f11acc58229fb6ae80d346277318ada4':
  Made it easier to disable overlay mechanism of location components.
 2013-04-23 03:50:20 -07:00
Michael Jurka
d93776f3b9 Merge "Update animation helper class to most recent version" 2013-04-23 10:05:25 +00:00
Todd Poynor
b2bb9f6232 BatteryService: Fix compile warning 
Add unhandled enum constant in switch.

Change-Id: I3c7635d9cf1fa1e57b139b9b66103bf660afe3a4
 2013-04-22 18:16:17 -07:00
Todd Poynor
a6017bc4bf BatteryService: Fix detection of missing sysfs attributes 
Recent conversion from char* to String8 broke these.

Change-Id: I4528c3e4b90614cddbc173ee996c7fc1febb2cf5
 2013-04-22 18:16:16 -07:00
Christopher Tate
7a4ddbaafa Merge "Don't attempt native crash reporting for persistent apps" into jb-mr2-dev 2013-04-22 20:26:30 +00:00
kmccormick
47cccbd09d am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit 'f9a152d8fbf012f990afe02a4ef3d528853ca30b':
  Doc update: Fix firewall text.
 2013-04-22 13:16:44 -07:00
kmccormick
f9a152d8fb am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit '0415ea6ad9a42837339ec5afc43f3defabe58e38':
  Doc update: Fix firewall text.
 2013-04-22 13:15:23 -07:00
kmccormick
0415ea6ad9 am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit '2aca8dbeaf0c08e59d75c78f5b237a9cd2691784':
  Doc update: Fix firewall text.
 2013-04-22 13:13:38 -07:00
Scott Main
3fadd4c256 am 8841569f: am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit '8841569fc835bb172e06dc3fba9597c643af8b31':
  fix backup registration url external bug: 54539
 2013-04-22 13:13:20 -07:00
Scott Main
8841569fc8 am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit 'b8ac12af56a3eb33be550ade27be62ff3d0689ed':
  fix backup registration url external bug: 54539
 2013-04-22 13:11:58 -07:00
kmccormick
2aca8dbeaf am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit 'b116885c42be983732a495bb84938d290211014f':
  Doc update: Fix firewall text.
 2013-04-22 13:11:53 -07:00
Scott Main
b8ac12af56 am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit '3da6ef399c5e3b42c0f5a8149b1f1d154556c1ff':
  fix backup registration url external bug: 54539
 2013-04-22 13:10:21 -07:00
kmccormick
b116885c42 am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit 'ce534905a63f97766f487798fd61cb8414da04fe':
  Doc update: Fix firewall text.
 2013-04-22 13:10:04 -07:00
Scott Main
3da6ef399c am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit 'd07bdb6fd165b31aa9e047095e18be7e76e74502':
  fix backup registration url external bug: 54539
 2013-04-22 13:08:33 -07:00
kmccormick
ce534905a6 Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 2013-04-22 20:08:11 +00:00
Baligh Uddin
08372b4237 Merge "Import translations. DO NOT MERGE" 2013-04-22 20:07:25 +00:00
Baligh Uddin
0cfcd76419 Merge "Import translations. DO NOT MERGE" 2013-04-22 20:06:42 +00:00
Scott Main
d07bdb6fd1 am 2779da87: fix backup registration url external bug: 54539 
* commit '2779da87e2414709afe462339bb3cfde7feb2965':
  fix backup registration url external bug: 54539
 2013-04-22 13:06:41 -07:00
Scott Main
2779da87e2 fix backup registration url 
external bug: 54539

Change-Id: I3d4e957d8b26c7462c7228a4e4755aee88d6895c
 2013-04-22 13:03:00 -07:00
Baligh Uddin
c404ff26f6 Merge "Import translations. DO NOT MERGE" 2013-04-22 20:00:12 +00:00
Baligh Uddin
b0579834e7 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-22 19:59:48 +00:00
Baligh Uddin
a9d36c121d Merge "Import translations. DO NOT MERGE" 2013-04-22 19:58:28 +00:00
Dianne Hackborn
3edf207a92 Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev 2013-04-22 19:49:24 +00:00
kmccormick
91290d59d5 Doc update: Fix firewall text. 
Change-Id: I06c1c86f591dc82f7004b6317062580269230cda
 2013-04-22 12:28:25 -07:00
Scott Main
9753ef1e7d am 35ac5b08: am abb6f472: am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit '35ac5b08e5e152eb6536bde3cd88a83cffc2ed5f':
  delete unused download page and add a couple search tags
 2013-04-22 12:21:52 -07:00
Scott Main
35ac5b08e5 am abb6f472: am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit 'abb6f472e5b3028a509a0c3cc1a841a52a9063e2':
  delete unused download page and add a couple search tags
 2013-04-22 12:19:36 -07:00
Scott Main
abb6f472e5 am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit '24a3899cb09e6af21f7886f2e567f725a5904e43':
  delete unused download page and add a couple search tags
 2013-04-22 12:17:49 -07:00
Scott Main
24a3899cb0 am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit '1aba107ddf8f8df33cbc84046ccc0c7f40a59352':
  delete unused download page and add a couple search tags
 2013-04-22 12:15:57 -07:00
Scott Main
1aba107ddf am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit 'c3ae5cd6852185e5a64173d3c5b3439ad507b156':
  delete unused download page and add a couple search tags
 2013-04-22 12:14:19 -07:00
Scott Main
c3ae5cd685 Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 2013-04-22 19:12:10 +00:00
Scott Main
e0c4bb4c22 delete unused download page and add a couple search tags 
Change-Id: I8aad4703d575e2c336129e92a2b9ef448d21a4f9
 2013-04-22 12:11:18 -07:00
Craig Mautner
6fe6424bc8 Merge "Move idle handling from ActivityStack to Supervisor" 2013-04-22 18:01:03 +00:00
Craig Mautner
f333327782 Move idle handling from ActivityStack to Supervisor 
Along with mFinishingActivities, mStartingUsers and
mCancelledThumbnails.

Change-Id: Ia354225d72e694b7ac68b0869fcab903a3d06436
 2013-04-22 10:55:53 -07:00
Dianne Hackborn
6c8c2f094c Assign final resource IDs for JB MR2. 
Change-Id: I72916fb590166ea17ed1e4a2ea648c3f61d62def
 2013-04-22 10:51:42 -07:00
Zhentao Sun
c5fc9988f1 Made it easier to disable overlay mechanism of location components. 
Fixed b/8276827

Vendor might want to provide their own implementation of "network
location", "fused location" and "geocoder" service. Location manager now
allows those service to be replaced by packages that have the same
signature as one of the packages in config_locationProviderPackageNames.
Such behavior might not be desirable on some devices. This change
make this behavior configurable by 3 boolean flags.

Details:
- Added three boolean flags in core/res/res/values/config.xml to enable
or disable NLP/FLP/Geocoder overlay
- Added 3 package name for the stock NLP/FLP/Geocoder. They are needed
  only when overlay is disabled because LocationManagerService need to
  know which package is preferred when searching for
  NLP/FLP/Geocoder service.
- Made ServiceWatcher able to handle non-overlayable services.
- Fixed an NPE isue in ServiceWatcher. mPm.queryIntentServicesAsUser
  might return null.
- Fixed an bug: justCheckThisPackage in bindBestPackageLocked is always
  ignored.

Change-Id: Id221961ac7c3aa8ad44b894f9523f04f770ae237
 2013-04-22 10:02:08 -07:00
Craig Mautner
be607dff94 Merge "Refactoring Activity Manager." 2013-04-22 16:32:04 +00:00
Craig Mautner
ce5f3cba6b Refactoring Activity Manager. 
Mid-course corrections.

- Simplify ActivityStackSupervisor and ActivityStack constructors to
get passed parameters from ActivityManagerService.
- Store WindowManagerService referecne locally in
ActivityStackSupervisor and ActivityStack.
- Rename getTopStack to getFocusedStack in ActivityStackSupervisor
and ActivityManagerService.
- Move mWaitingActivityLaunched/reportActivityLaunchedLocked and
mWaitingActivityVisible/reportActivityVisibleLocked from ActivityStack
to ActivityStackSupervisor.
- Moved reportResumedActivity to ActivityStackSupervisor.
- Added a Handler to ActivityStackSupervisor. Will populate it on next
CL.

Change-Id: I1bbe5eb737c5cac6b896bc9748f329891e94d00f
 2013-04-22 09:12:38 -07:00