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

90755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
3f4e938e0a am fda0b508: am c7fe9fd4: Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev 
* commit 'fda0b508b08e2718ac8552db198b6f902a3c605c':
  Doc change: remove old version of gcm javadoc and misc files.
 2012-12-02 17:47:44 -08:00
Dirk Dougherty
fda0b508b0 am c7fe9fd4: Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev 
* commit 'c7fe9fd4e02bcb8a1c4eab2b61ec85b3a8e05eca':
  Doc change: remove old version of gcm javadoc and misc files.
 2012-12-02 17:45:39 -08:00
Dirk Dougherty
c7fe9fd4e0 Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev 2012-12-02 17:43:12 -08:00
Dirk Dougherty
587504a434 Doc change: remove old version of gcm javadoc and misc files. 
Change-Id: Icbc0345e04432af97fb859be8787741b7e979c1b
 2012-12-02 17:33:52 -08:00
Katie McCormick
d50fcc06d0 am 36166345: am f3dda724: Merge "Doc change: updating lib links" into jb-mr1-dev 
* commit '361663455f2e665e6461f16f83d71ac39b1665df':
  Doc change: updating lib links
 2012-12-02 16:52:22 -08:00
Katie McCormick
361663455f am f3dda724: Merge "Doc change: updating lib links" into jb-mr1-dev 
* commit 'f3dda7243c267a807d11a120219478f3a98f0275':
  Doc change: updating lib links
 2012-12-02 16:50:46 -08:00
Katie McCormick
f3dda7243c Merge "Doc change: updating lib links" into jb-mr1-dev 2012-12-02 16:48:15 -08:00
Scott Main
075f554ae3 am 12de574e: am 80aab876: move Setup link for play services 
* commit '12de574edecd47d83142c8225a8200073123f3b6':
  move Setup link for play services
 2012-12-02 16:04:16 -08:00
Scott Main
12de574ede am 80aab876: move Setup link for play services 
* commit '80aab87653aa6089e89039b74530073202f4c355':
  move Setup link for play services
 2012-12-02 16:02:14 -08:00
Katie McCormick
b755c27fc0 Doc change: updating lib links 
Bug # 7038255

Change-Id: I702aeaed5fcbf7a9cb46b2ccd0e7baff53e48dab
 2012-12-01 11:25:37 -08:00
Scott Main
80aab87653 move Setup link for play services 
Change-Id: I436abf4929e2d69c5f9fadca0f79321d069618ea
 2012-11-30 20:28:58 -08:00
Scott Main
a99ee74c0d am 76277df2: am 5f7b668c: misc changes for landing pages 
* commit '76277df27c4d4df39321c400bd5adece32a59b58':
  misc changes for landing pages
 2012-11-30 20:13:15 -08:00
Scott Main
76277df27c am 5f7b668c: misc changes for landing pages 
* commit '5f7b668c966a886d5893ff89af59785fab9523f9':
  misc changes for landing pages
 2012-11-30 20:11:04 -08:00
Scott Main
5f7b668c96 misc changes for landing pages 
Change-Id: I4eff32dccbb111b419bb733035c7a145ac3944b6
 2012-11-30 19:32:21 -08:00
Amith Yamasani
32df98d52d am c566b43d: Fix crosstalk between users for widgets hosted in lockscreen 
* commit 'c566b43d02596cba437e9a2723e9f989297cca72':
  Fix crosstalk between users for widgets hosted in lockscreen
 2012-11-30 18:44:36 -08:00
Amith Yamasani
c566b43d02 Fix crosstalk between users for widgets hosted in lockscreen 
This was initially about the Clock widget crashing repeatedly on some
devices with multiple users. Turned out that there were race conditions
when switching users that could result in remote views of one user calling
back to the RemoteViewsAdapter in keyguard that in turn sent an incorrect widget id
to a different user's widget, resulting in a crash.

Since KeyguardHostView is instantiated in the same process for different users,
it needs to carry a user identity to pass along to AppWidgetService so that
remote views services were bound to the correct user and callbacks were attached and
detached properly.

Added some aidl calls that take the userId to do the binding properly. A more
complete fix might be needed in the future so that all calls from Keyguard carry
the user id.

Also, there was a problem in comparing host uid for secondary users, since Settings
for a secondary user has a different uid than keyguard. Not an issue on single-user
systems. Changed the host.uid comparison to accomodate for the secondary user.

Bug: 7450247
Change-Id: Idbc36e3c60023cac74174f6cb7f2b2130dd3052c
 2012-11-30 17:28:08 -08:00
Fabrice Di Meglio
4e1b2f44e9 am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 
* commit '20b76b9fff076241fe305fc99be3be7ab7d10407':
  Fix typos in LinearLayout comments
 2012-11-30 17:18:49 -08:00
Fabrice Di Meglio
20b76b9fff am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 
* commit '1e761ded55695a9d76a6f00ee9504625581e8d3a':
  Fix typos in LinearLayout comments
 2012-11-30 17:17:03 -08:00
Fabrice Di Meglio
1e761ded55 Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 2012-11-30 17:14:11 -08:00
Scott Main
15ac2cfb65 am ed3d92ae: am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev 
* commit 'ed3d92aea49422c0e5ec117a04fe573ea141962a':
  docs: gcm navtree
 2012-11-30 17:08:59 -08:00
Scott Main
ed3d92aea4 am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev 
* commit '404eeee14521e8b181a9ed28c2291e9389dcf3b1':
  docs: gcm navtree
 2012-11-30 17:07:11 -08:00
Scott Main
404eeee145 Merge "docs: gcm navtree" into jb-mr1-dev 2012-11-30 17:04:31 -08:00
Robert Ly
2123523290 docs: gcm navtree 
Change-Id: Ie20a0cc7caf8e0b5ff2a6f56ddc3932f25768fa3
 2012-11-30 17:02:22 -08:00
Quddus Chong
f8b74a32df am 3a195029: am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 
* commit '3a195029066fab3bae5797003314e3fa5bbf7e29':
  docs: Fixed typo in android tool syntax.
 2012-11-30 16:44:29 -08:00
Craig Mautner
f967500eba am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev 
* commit '46732445b4c02c225544851cb6cf848ec0583494':
  Include child windows when looking for insertion point.
 2012-11-30 16:42:56 -08:00
Quddus Chong
3a19502906 am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 
* commit '51f5bcac5269b44cd312d16569357416da7b3a82':
  docs: Fixed typo in android tool syntax.
 2012-11-30 16:41:49 -08:00
Fabrice Di Meglio
a9854ce9df am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev 
* commit 'ce463847db68afbb796377c6a55209e102774f8c':
  Fix bug #7651552 resetRtlProperties() is called way too often
 2012-11-30 16:41:12 -08:00
Quddus Chong
51f5bcac52 Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 2012-11-30 16:39:29 -08:00
Craig Mautner
46732445b4 Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev 2012-11-30 16:38:37 -08:00
Robert Ly
697802538f am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 
* commit '27dcf445eb66ea032992ff30b3cd36770e1ab929':
  docs: update javadocs with gcm @value stuff
 2012-11-30 16:38:12 -08:00
Fabrice Di Meglio
ce463847db Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev 2012-11-30 16:37:17 -08:00
Robert Ly
27dcf445eb am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 
* commit '037b7944bdd5909c503cdc959b0105ebb0ecca92':
  docs: update javadocs with gcm @value stuff
 2012-11-30 16:36:05 -08:00
Robert Ly
037b7944bd Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 2012-11-30 16:33:51 -08:00
Quddus Chong
4e58eca788 docs: Fixed typo in android tool syntax. 
Change-Id: Ic40f10e3f6b7c052dc40cb723f40956a750544e8
 2012-11-30 16:26:35 -08:00
Robert Ly
672b3ad589 docs: update javadocs with gcm @value stuff 
Change-Id: I837a1734e00d61f74cf8faac78f75258d66b6d05
 2012-11-30 16:15:46 -08:00
Craig Mautner
7b1aa77a9b Include child windows when looking for insertion point. 
After finding a window in the window list we turn around and look in
the AppWindowToken.windows list for it. If it is a child of a window
in that list we should use the parent windows index as the search
result. Instead we gave up and ended up inserting the window at the
beginning of the windows list.

Bug 7357465 fixed.

Change-Id: If77f343b8597bfbb0b7fa41dedf7972d78d03020
 2012-11-30 16:14:45 -08:00
Jim Miller
f6fe244422 am e431e6a3: Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev 
* commit 'e431e6a352125f2c51507130cc64e3405625a7ec':
  Add logging to try and track down bug 7643792
 2012-11-30 16:00:17 -08:00
Jim Miller
e431e6a352 Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev 2012-11-30 15:57:46 -08:00
Jim Miller
2b84b817e4 Add logging to try and track down bug 7643792 
Fix whitespace & log message.

Change-Id: I9d241365503a6a9b02d3155dbb06ddb82065b375
 2012-11-30 15:54:38 -08:00
Dirk Dougherty
338b3a2f96 am 0a40f2d4: am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev 
* commit '0a40f2d4d28d99a6cd1216f3aa47cb10d6b905cc':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
 2012-11-30 15:41:21 -08:00
Nicolas Klein
04f3b12f1f am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 
* commit '5ea914f21b397ae57195decd0b5e37544d85db8c':
  Fix some typos and missing @param in android.os.Bundle
 2012-11-30 15:41:10 -08:00
Dirk Dougherty
0a40f2d4d2 am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev 
* commit '23b4e5b1b5c3af565f2af87be243e7b455002ae7':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
 2012-11-30 15:38:19 -08:00
Dirk Dougherty
23b4e5b1b5 Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev 2012-11-30 15:35:47 -08:00
Dirk Dougherty
d589421093 Doc change: add SMP Primer for Android. Support a new "article" toc style in training. 
Change-Id: I75826e12bb255e1fe85822b8c51e750ada01dfc5
 2012-11-30 15:33:39 -08:00
Fabrice Di Meglio
cb5f9db47a Fix bug #7651552 resetRtlProperties() is called way too often 
- remove unnecessary calls to resetRtlProperties().
- now reset of RTL properties will only be done when adding a View
(and no more when removing it)

Change-Id: I0d42128c9f7df6085fb92bb5af5c9bd4d1ba88a3
 2012-11-30 15:32:56 -08:00
Nicolas Klein
5ea914f21b am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 
* commit '759c1005b3f96ea8bbf59192d206aacece315655':
  Fix some typos and missing @param in android.os.Bundle
 2012-11-30 14:54:50 -08:00
Nicolas Klein
759c1005b3 Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 2012-11-30 14:51:43 -08:00
Nicolas Klein
9f6cb87522 Fix some typos and missing @param in android.os.Bundle 
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.

Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
 2012-11-30 14:41:46 -08:00
Robert Ly
deab6fd2e8 am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev 
* commit 'b67ab7ccd6d09d30caf8a85a9ea20fc991652258':
  docs: gms fixes
 2012-11-30 14:38:18 -08:00
Robert Ly
b67ab7ccd6 am 648de548: Merge "docs: gms fixes" into jb-mr1-dev 
* commit '648de5483b20bd80bda267a4430daca2ae0b089a':
  docs: gms fixes
 2012-11-30 14:35:48 -08:00