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

1038 Commits

Author SHA1 Message Date
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
 2012-11-07 13:08:25 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
Marco Nelissen
a4256d1d7b Fix typo 
Change-Id: I8c3797fb2d343ec6f25765fba49ac097e816d1cf
 2012-11-01 13:55:28 -07:00
Mike Lockwood
c59b2f9a77 More changes to fix PDK build: 
move screencap back to frameworks/base
move libdiskusage to frameworks/native

Change-Id: I8abe425c4bbf305bbe8650094c40c16df8c6d5e4
 2012-10-24 12:31:10 -07:00
Mike Lockwood
e0e9e9462c Move app_process and system_server back to frameworks/base 
due to dependency on libandroid_runtime

Change-Id: I96c0ba72ea406c9e7e63b9a160498187b6ec9b21
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-10-24 11:52:57 -07:00
Mike Lockwood
6931061de6 Move non-Java commands to frameworks/native 
Change-Id: Id77c2cecb27cec500dfe066e4430f9e67802a433
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-10-24 10:43:42 -07:00
Dave Burke
aea7b6903b am da2f2e51: am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 
* commit 'da2f2e51c71b5ebc50fe76c3cd5a920c81a5ee92':
  Revert "Check non-primary user dirs during package scan"
 2012-10-23 23:19:01 -07:00
Dave Burke
da2f2e51c7 am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 
* commit '799916e6ac706921e43a3382e5d9e06e13f87525':
  Revert "Check non-primary user dirs during package scan"
 2012-10-23 23:17:23 -07:00
Dave Burke
799916e6ac Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 2012-10-23 23:14:15 -07:00
Dave Burke
383fa18b51 Revert "Check non-primary user dirs during package scan" 
This reverts commit 4525f5b69cb44a9a0c92f9c525fc47541f456621

Change-Id: I31b7a0860972532478ab3420556b806bfa78739a
 2012-10-23 23:12:19 -07:00
Kenny Root
5e24b92f04 am f461d3f6: am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev 
* commit 'f461d3f69f4533045167b4dc1f7445ad6ae47af3':
  Check non-primary user dirs during package scan
 2012-10-23 17:10:24 -07:00
Kenny Root
f461d3f69f am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev 
* commit 'da2509c434ebb2a5a0da1bc270cae7f007cbb0f9':
  Check non-primary user dirs during package scan
 2012-10-23 17:06:24 -07:00
Kenny Root
da2509c434 Merge "Check non-primary user dirs during package scan" into jb-mr1-dev 2012-10-23 17:03:09 -07:00
Kenny Root
4525f5b69c Check non-primary user dirs during package scan 
During package scan, only the primary user data directories were
checked. If the secondary user didn't have an application directory, it
would happily ignore it. The app would then crash upon startup.

Bug: 7391882
Change-Id: I1fa92aa27386104d4ac6bc5dc92bfbf2e7dfac9f
 2012-10-22 18:48:24 -07:00
Kenny Root
465fd635d5 am 3ce8eb4e: am 55708a9d: am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev 
* commit '3ce8eb4eb24f90b8d850e3dc7c18569dd1fd361a':
  Clear data deletes too much
 2012-10-22 16:19:52 -07:00
Kenny Root
3ce8eb4eb2 am 55708a9d: am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev 
* commit '55708a9dce5be627f68e388d4ad355595ad5fef5':
  Clear data deletes too much
 2012-10-22 16:17:17 -07:00
Kenny Root
55708a9dce am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev 
* commit 'e03c0244717093e0fbc9b05073d3ae3dbd8fcea5':
  Clear data deletes too much
 2012-10-22 16:14:14 -07:00
Kenny Root
9157d3f3b7 Clear data deletes too much 
Bug: 7389445
Change-Id: Ic12d7a8e37747dc1a9b71ec5f881b5e440e0a75e
 2012-10-22 15:20:52 -07:00
Kenny Root
a7fb9d907c am 9396f183: resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp 
* commit '9396f183c2db5d6167f39a8d5667fb4abcc96e5e':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users
 2012-10-19 17:20:03 -07:00
Kenny Root
9396f183c2 resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp 
Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8
 2012-10-19 17:16:41 -07:00
Kenny Root
a5d29b2c14 am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev 
* commit '9bef3294d3660a85442829a25c9777e25d3c3cc8':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users
 2012-10-19 16:40:07 -07:00
Kenny Root
a3e90798b7 Robustly add symlink and add for non-primary users 
Amazingly, some apps still don't use the nativeLibraryPath. So add a lib
symlink for non-primary users to fix that.

Also, there was an error when the symlink existed that it would give up.
This shouldn't really happen, but in that case, just remove it and
create a new one to be safe.

Also, move the downgrade code to the appropriate place. This downgrade
case triggered the above symlink existing bug.

Bug: 7318366
Bug: 7371571
Change-Id: Ia175b36d98f00bdc2f2433b909aafd524eb34d15
 2012-10-18 15:12:09 -07:00
Kenny Root
ebf5569880 am 63a183c4: Merge "resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp" into jb-mr1-dev-plus-aosp 
* commit '63a183c41f26e4eb475dfbcc4386b37372eb5fba':
  Fix mistaken removal of setfilecon
 2012-10-17 10:53:51 -07:00
Kenny Root
367400491a resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp 
Change-Id: I6075e2bf98b0f8310c93fac649c34cbbbd89707f
 2012-10-17 10:50:14 -07:00
Kenny Root
115198ba1a am ed3ce513: Fix bad merge 
* commit 'ed3ce513a64b9f26358dc77187d6d04fe91abae9':
  Fix bad merge
 2012-10-17 10:10:27 -07:00
Kenny Root
ed3ce513a6 Fix bad merge 
Change-Id: I9f05f96e3607b994368a8d4e1e454af8fe84424d
 2012-10-17 10:06:17 -07:00
Kenny Root
21dc0aa5a4 am ad0090e7: resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp 
* commit 'ad0090e7b8c70cf44609aafbfea8c3946e2802a9':
  Remove HAVE_SELINUX guards
 2012-10-17 10:05:58 -07:00
Kenny Root
ad0090e7b8 resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp 
Change-Id: I9ae49075935f0e9ec432ce9d828ee26a4fcdb44c
 2012-10-17 10:02:22 -07:00
Kenny Root
57c63d8f9b Fix mistaken removal of setfilecon 
Previous commit attempted to move setfilecon above chown, but mistakenly
squashed libdir and pkgdir setfilcon into one incorrect setfilecon.

Change-Id: I1ad00eae8a0e69ae88ce47cd5571558ce1ad2145
 2012-10-17 09:50:37 -07:00
Kenny Root
c9a1aabc49 Remove HAVE_SELINUX guards 
Change-Id: I6c2161471f657aa1645695ffd56ff434b0c2b426
 2012-10-16 23:32:31 -07:00
Jeff Sharkey
0fa6bf683c am a1fda2e3: am 77ce60a5: am 7789c9bb: Merge "Support pm clear as --user." into jb-mr1-dev 
* commit 'a1fda2e388603152d45ea5ef43b1c9b6d6935b6b':
  Support pm clear as --user.
 2012-10-15 20:22:37 -07:00
Jeff Sharkey
a1fda2e388 am 77ce60a5: am 7789c9bb: Merge "Support pm clear as --user." into jb-mr1-dev 
* commit '77ce60a59330d6059011d737142bd210db845d85':
  Support pm clear as --user.
 2012-10-15 20:19:04 -07:00
Jeff Sharkey
77ce60a593 am 7789c9bb: Merge "Support pm clear as --user." into jb-mr1-dev 
* commit '7789c9bbfca079655e9285173d6175b94bc774b0':
  Support pm clear as --user.
 2012-10-15 18:29:51 -07:00
Jeff Sharkey
a3e9ff7deb Support pm clear as --user. 
Bug: 7352703
Change-Id: I0e9cc4f2313e5424d234c3cb051004c0321d9dac
 2012-10-15 16:16:39 -07:00
Kenny Root
0054cbd4db Add interrupter library to simulate EINTR 
To check for robustness against EINTR from syscalls, add an
interrupter library that can be preloaded with LD_PRELOAD.

Change-Id: I0a6cd8702ec5bc6b2927a5e223ee3cdc033860a2
 2012-10-15 08:53:46 -07:00
Jeff Sharkey
3b5259fcbe am 1e8f7262: am a00ffa53: am 1016b288: Merge "Pm command to get maximum users." into jb-mr1-dev 
* commit '1e8f7262febf77580e830374af2f5c5236081a0f':
  Pm command to get maximum users.
 2012-10-12 12:21:46 -07:00
Jeff Sharkey
1e8f7262fe am a00ffa53: am 1016b288: Merge "Pm command to get maximum users." into jb-mr1-dev 
* commit 'a00ffa53fbe7ced0147451242232f47d117d5e2d':
  Pm command to get maximum users.
 2012-10-12 12:19:34 -07:00
Jeff Sharkey
a00ffa53fb am 1016b288: Merge "Pm command to get maximum users." into jb-mr1-dev 
* commit '1016b2881d2b5f5d5e142afa287bd876b6360c2b':
  Pm command to get maximum users.
 2012-10-12 12:17:17 -07:00
Jeff Sharkey
4c76ea6b88 Pm command to get maximum users. 
Used to drive CTS tests.  Also print success message when removing
a user.

Bug: 7334718
Change-Id: Ia3886ddf860cd000ce567b0fed2ef0a4e2a2295c
 2012-10-12 10:46:01 -07:00
Jeff Sharkey
d3ab7fc537 am 24251648: am 9ad36ded: am 9dfca201: Merge "Print newly generated userId." into jb-mr1-dev 
* commit '2425164835e9bbf4c501c69c078b2c1a48f3414e':
  Print newly generated userId.
 2012-10-11 17:55:15 -07:00
Jeff Sharkey
2425164835 am 9ad36ded: am 9dfca201: Merge "Print newly generated userId." into jb-mr1-dev 
* commit '9ad36dedd668c3bfa906397baa3d0aa76cfe1216':
  Print newly generated userId.
 2012-10-11 17:29:02 -07:00
Jeff Sharkey
9ad36dedd6 am 9dfca201: Merge "Print newly generated userId." into jb-mr1-dev 
* commit '9dfca20105aa998f5767b1b330bf9307ec479906':
  Print newly generated userId.
 2012-10-11 17:25:53 -07:00
Jeff Sharkey
e6d3ccc992 Print newly generated userId. 
Bug: 7334718
Change-Id: Id4dc456b079bebbe9f2d7ea2a8343d2215f296dc
 2012-10-11 16:44:18 -07:00
Dianne Hackborn
3c30494d44 am 572286b4: am 31af905a: am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '572286b4152245a73ac00ebc69b4bd8fc4bc586d':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:17:09 -07:00
Dianne Hackborn
572286b415 am 31af905a: am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '31af905ac5388339fd0ffd87e6f25bd2a293dc0e':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:14:24 -07:00
Dianne Hackborn
31af905ac5 am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '36db9d0879640a1cb9a8723d6649068a1c4c08de':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:13:13 -07:00
Dianne Hackborn
c0bd747b06 Further work on issue #7307399: Framework needs a new pre-user-shutdown... 
...phase & callback API

I realized there were a few things wrong with what was there.  The new
ACTION_USER_STARTING was not being sent for the first user at boot, and
there was an existing problem where ACTION_USER_STARTED was sent every
time there was a user switch.

Also improved some debug output of broadcasts to make it easier to see
what is going on in this stuff, and better reporting of why a service
couldn't be started.

Change-Id: Id8a536defbbad1f73d94a37d13762436b822fbe3
 2012-10-09 17:57:14 -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
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