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

81225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
3e975309bf am 623898f0: Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev 
* commit '623898f099d8ab99f638fbd8062f3c227800fdf5':
  docs: GL Tracer, Device Monitor Tools for SDK r20
 2012-06-26 16:47:26 -07:00
Robert Ly
93b4fbef19 docs: add landing for gcm 
Change-Id: Icfe158670c0a07a6dffed496a444e49b5c5ef926
 2012-06-26 16:46:21 -07:00
Joe Fernandez
3632af395c Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev 2012-06-26 16:45:31 -07:00
Joe Fernandez
623898f099 Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev 2012-06-26 16:45:12 -07:00
Dianne Hackborn
5359bc38a2 am 2e8295ce: am 3bb98aec: Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev 
* commit '2e8295ce1861d8284f16e0f0f80475db0ec2983f':
  Fix issue #6730064: When turning off Nakasi, it very often...
 2012-06-26 16:40:48 -07:00
Dianne Hackborn
2e8295ce18 am 3bb98aec: Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev 
* commit '3bb98aec9344af1299b90d1567b4443e4d50cc91':
  Fix issue #6730064: When turning off Nakasi, it very often...
 2012-06-26 16:38:00 -07:00
Dianne Hackborn
3bb98aec93 Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev 2012-06-26 16:36:36 -07:00
Mike Lockwood
1e855d98aa MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes 
Bug: 6684451

Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-06-26 16:33:05 -07:00
Joe Fernandez
3e820bee2b docs: GL Tracer, Device Monitor Tools for SDK r20 
Change-Id: Ib45210b88a7eb93e3bba4f7d535f344ccb054a72
 2012-06-26 16:27:18 -07:00
Katie McCormick
4fb85d3515 am 70585ac6: am eb2ab860: Merge "Doc update: Adding new GCM docs." into jb-dev 
* commit '70585ac646998f4c6773b8c17c48210419bf676f':
  Doc update: Adding new GCM docs.
 2012-06-26 15:33:21 -07:00
Katie McCormick
70585ac646 am eb2ab860: Merge "Doc update: Adding new GCM docs." into jb-dev 
* commit 'eb2ab860259af98f0f640dc10f1c5fce7a17cbc1':
  Doc update: Adding new GCM docs.
 2012-06-26 15:30:48 -07:00
Katie McCormick
eb2ab86025 Merge "Doc update: Adding new GCM docs." into jb-dev 2012-06-26 15:29:05 -07:00
Nick Kralevich
4b447b91de Add mode when open(O_CREAT) is used. 
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a compile error in a future Android change.

Change-Id: I8635e8b69587ed107253870d991c3fcf563ca876
 2012-06-26 15:03:38 -07:00
Katie McCormick
76c6d86b5e Doc update: Adding new GCM docs. 
Change-Id: I98dcbad644e416538f6dcad64a063809f8662e24
 2012-06-26 14:55:45 -07:00
Dianne Hackborn
ea401541c5 Fix issue #6730064: When turning off Nakasi, it very often... 
...turns itself immediately back on.

The ON_AFTER_RELEASE flag is documented to not turn the screen on if
it is currently off.

Unfortunately, it didn't seem to actually do this -- it would just
cause a userActivity() call, which turns on the screen if it is
currently off.

Fix this by adding yet another boolean to that function to tell it
to not poke user activity if the screen is off.  (Yes the number of
booleans on it is now insane, and should be cleaned up after we
get through JB.)

Bug: 6730064
Change-Id: I850dfbc777c7668d08b7d63f42a293e22b878256
 2012-06-26 14:44:08 -07:00
Joe Fernandez
d80f095efb am 719ff2c4: am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev 
* commit '719ff2c4684254074ee9071ffa20aa6f684f921c':
  docs: ADK 2012 documentation with AOA protocol docs
 2012-06-26 13:19:56 -07:00
Joe Fernandez
719ff2c468 am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev 
* commit 'fb4a0e452b81794884b95daa2121a9953ade4e36':
  docs: ADK 2012 documentation with AOA protocol docs
 2012-06-26 13:17:38 -07:00
Peter Ng
c3bc9efee4 am 7b6698e7: am 3c6f8e4d: Merge "image typos in documents fix" into jb-dev 
* commit '7b6698e7bee3b62ec95c1620e2be75af14a4c360':
  image typos in documents fix
 2012-06-26 13:16:38 -07:00
Gilles Debunne
704c79a497 am 034a5776: am f6656b80: Merge "Reducing the contrast of text underline" into jb-dev 
* commit '034a57764b6791fd894285df78e02ad2d20992cd':
  Reducing the contrast of text underline
 2012-06-26 13:16:35 -07:00
Joe Fernandez
fb4a0e452b Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev 2012-06-26 13:15:26 -07:00
Peter Ng
7b6698e7be am 3c6f8e4d: Merge "image typos in documents fix" into jb-dev 
* commit '3c6f8e4da0abc47b0d52e47edefa694bd81b8042':
  image typos in documents fix
 2012-06-26 13:14:25 -07:00
Gilles Debunne
034a57764b am f6656b80: Merge "Reducing the contrast of text underline" into jb-dev 
* commit 'f6656b80c203a2537aa30682f7e682a69e742e21':
  Reducing the contrast of text underline
 2012-06-26 13:14:23 -07:00
Peter Ng
3c6f8e4da0 Merge "image typos in documents fix" into jb-dev 2012-06-26 13:12:45 -07:00
Gilles Debunne
f6656b80c2 Merge "Reducing the contrast of text underline" into jb-dev 2012-06-26 13:12:07 -07:00
Robert Ly
2fef717699 am dcf4eeb0: am 95bb4099: Merge "docs: rs api docs" into jb-dev 
* commit 'dcf4eeb0363399279c1905eaffb825dc722301b4':
  docs: rs api docs
 2012-06-26 12:17:54 -07:00
Robert Ly
dcf4eeb036 am 95bb4099: Merge "docs: rs api docs" into jb-dev 
* commit '95bb409981496b23448f02df34faaf384ca28a9f':
  docs: rs api docs
 2012-06-26 12:15:26 -07:00
Robert Ly
95bb409981 Merge "docs: rs api docs" into jb-dev 2012-06-26 12:14:04 -07:00
Robert Ly
fd73b5844c docs: rs api docs 
Change-Id: Ib2f1ae1ba47118242d4a52b943f5eba26714aa1f
 2012-06-26 12:07:13 -07:00
Peter Ng
c36b8655b9 image typos in documents fix 
Change-Id: I357ff2d99bc2dff9ac27cfd6d1e97afb35740dbc
 2012-06-26 11:18:29 -07:00
Kenny Root
25a525411b am 7d33d0c3: am c17f92ce: Merge "Use removePackageLI instead of removing mPackages" into jb-dev 
* commit '7d33d0c36c7e8c9de4139af383f7491823055bc7':
  Use removePackageLI instead of removing mPackages
 2012-06-26 10:39:24 -07:00
Kenny Root
7d33d0c36c am c17f92ce: Merge "Use removePackageLI instead of removing mPackages" into jb-dev 
* commit 'c17f92ce047e8d62fac829d1df5dae654f7e4de8':
  Use removePackageLI instead of removing mPackages
 2012-06-26 10:36:54 -07:00
Kenny Root
c17f92ce04 Merge "Use removePackageLI instead of removing mPackages" into jb-dev 2012-06-26 10:34:44 -07:00
John Spurlock
48d4ab73d5 am 59bd7c2f: am 64b7a3e9: Merge "TabletStatusBar: Lights-out shadow view should be taller" into jb-dev 
* commit '59bd7c2f4e5f1e2aedf9a8ca578561c13e4b6be3':
  TabletStatusBar: Lights-out shadow view should be taller
 2012-06-26 09:59:38 -07:00
John Spurlock
59bd7c2f4e am 64b7a3e9: Merge "TabletStatusBar: Lights-out shadow view should be taller" into jb-dev 
* commit '64b7a3e99526550aacd95f1dbd35487df7375ac6':
  TabletStatusBar: Lights-out shadow view should be taller
 2012-06-26 09:57:47 -07:00
John Spurlock
64b7a3e995 Merge "TabletStatusBar: Lights-out shadow view should be taller" into jb-dev 2012-06-26 09:55:53 -07:00
Raph Levien
e3bfa279cc Merge "Initialize shaper offset array. Needed for bug 5443796." 2012-06-26 09:46:27 -07:00
Raph Levien
f62034d896 Initialize shaper offset array. Needed for bug 5443796. 
Harfbuzz apparently requires the offset array to be initialized to zero,
otherwise it can report corrupt glyph positions. This change also
contains a small amount of refactoring to avoid code duplication.

Change-Id: I2553974f40bc8e0549876c7d31243960ca92a8a2
 2012-06-26 08:59:17 -07:00
The Android Open Source Project
0cedfe09e5 am 51d33db0: Reconcile with jb-release 
* commit '51d33db0f1f190110824b03a2ee6dda07b99ecaf':
 2012-06-26 07:21:26 -07:00
The Android Open Source Project
51d33db0f1 Reconcile with jb-release 
Change-Id: I93b16393c39020ad35743106f8c44970b69b1dfa
 2012-06-26 07:18:21 -07:00
Joe Fernandez
3a77ccc63f docs: ADK 2012 documentation with AOA protocol docs 
Change-Id: Ife96b3ffa890d42fc97125b30bdd389448645562
 2012-06-26 02:24:32 -07:00
Scott Main
bf5c483813 am d1ae2d71: am e066fd3c: Merge "docs: move NDK into Download section" into jb-dev 
* commit 'd1ae2d715e135a2895f39ac053499c623faa24ae':
  docs: move NDK into Download section
 2012-06-25 21:23:47 -07:00
Scott Main
d1ae2d715e am e066fd3c: Merge "docs: move NDK into Download section" into jb-dev 
* commit 'e066fd3c9b2270e182eb87be8efb1d5c4aee60e2':
  docs: move NDK into Download section
 2012-06-25 21:20:02 -07:00
Scott Main
e066fd3c9b Merge "docs: move NDK into Download section" into jb-dev 2012-06-25 21:17:49 -07:00
Dianne Hackborn
a4b7f2f75e Use two fingers to work some magic... 
Change-Id: Ibcb3dbd3d158c22da8277e544d81fb47eadccd49
 2012-06-25 19:19:15 -07:00
Nick Kralevich
6a15634f60 am 3346bc69: am ab294eeb: Merge "DevicePolicyManagerService: dump less" into jb-dev 
* commit '3346bc69493e75565208f9b485bd6038e6abefe9':
  DevicePolicyManagerService: dump less
 2012-06-25 18:48:27 -07:00
Nick Kralevich
3346bc6949 am ab294eeb: Merge "DevicePolicyManagerService: dump less" into jb-dev 
* commit 'ab294eeb20d884855b038600f94a6e17b88b5772':
  DevicePolicyManagerService: dump less
 2012-06-25 18:46:12 -07:00
Nick Kralevich
ab294eeb20 Merge "DevicePolicyManagerService: dump less" into jb-dev 2012-06-25 18:43:56 -07:00
Dianne Hackborn
dfcd6653c5 am e53fd84a: am 9e608c12: Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev 
* commit 'e53fd84a28584692d9c99712a3d36100643ba000':
  Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.
 2012-06-25 18:17:19 -07:00
Dianne Hackborn
e6c2d62efb am 9906e784: am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev 
* commit '9906e784faca2cc8388a04fdc544722ea93d51be':
  Fix issue #6717667: expanded notification actions don't work on the lock screen
 2012-06-25 18:17:15 -07:00
Dianne Hackborn
2ccb112633 am b4215267: (-s ours) am fca66cd8: Merge "DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses" into jb-dev 
* commit 'b4215267f342759c8bdad02ed124dae4bb6d6833':
  DO NOT MERGE Fix issue #6697105: App launching sometimes has random pauses
 2012-06-25 18:17:12 -07:00