Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,618 Commits 3 Branches 0 Tags
0596497df751cc7445593bd43b7748af6c6ed892
Commit Graph

3627 Commits

Author SHA1 Message Date
Dianne Hackborn
cc275c58b0 am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-09-30 16:50:09 +00:00
Dianne Hackborn
ccd08f23b0 am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-30 14:55:26 +00:00
Dianne Hackborn
fb3809ca63 Fix issue #17705755: Battery stats resets at incorrect times 
Revert back to (mostly) KK behavior, fix a problem where we were
collecting some data in an inconsistent state.

Change-Id: Ida3ca3fb734a9d7d61a90fd5044152e927c59e02
 2014-09-29 18:31:22 -07:00
Dianne Hackborn
73d6a821ae Work on issue #17656716: Unhandled exception in Window Manager 
Remove the checks for large parcel sizes.  Those were triggering,
and identifyng the area of the problem, but also cause a lot of
trouble by making the unsafe deadlocky code there much more likely
to deadlock.

Add logging for strict mode IPCs, since those seem to be the
problem.  Only log when things look bad.

Also add a log when battery stats are reset, to diagnose why they
are getting reset when they shouldn't be.

Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
 2014-09-29 16:04:02 -07:00
jgu21
208678718f Frameworks/base: Early init native bridge 
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

(cherry picked from commit 2eacd06bfb)

Bug: 17671501
Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
 2014-09-28 15:35:59 -07:00
Elliott Hughes
0844233e99 am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '70c1f083332729a586d670af7565732a2eb06ab4':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 22:58:51 +00:00
Elliott Hughes
f839b4fcb6 Set the system locale correctly even on an encrypted device. 
Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
 2014-09-26 15:18:20 -07:00
Dianne Hackborn
c29de2ffb2 am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit '45245d6117ae484bb84d9afa3fbda36d59886059':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 21:57:49 +00:00
Dianne Hackborn
2f1993ec46 Fix issue #17671802: "content" command always prints... 
..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"

Make sure to clear calling identity before getting into the guts
of the activity manager.  Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.

Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
 2014-09-26 11:28:01 -07:00
Adam Powell
9cd82d061a am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit 'da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 00:16:41 +00:00
Adam Powell
a35c77aea6 Always show the name of the last used Home app in ResolverActivity 
Bug 17629220

Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
 2014-09-25 16:54:41 -07:00
Adrian Roos
40c632b931 am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
  Ensure that setting an empty password clears it
 2014-09-25 23:44:18 +00:00
Adrian Roos
625e8f5959 Merge "Ensure that setting an empty password clears it" into lmp-dev 2014-09-25 22:42:43 +00:00
Paul Lawrence
f0eed92b04 am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '56a38862d68c3160ae9b049ca89422cc5834e8e3':
  Fix pause when setting pin/pattern/password
 2014-09-25 18:46:17 +00:00
Paul Lawrence
3a5a0be61e Fix pause when setting pin/pattern/password 
Move setting encryption pin/pattern/password into a separate thread

Bug: 17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
 2014-09-25 17:32:19 +00:00
Adrian Roos
ab7dae58cc Ensure that setting an empty password clears it 
Bug: 17496766
Change-Id: I7c29b632519247bc5675a05ef6cc90902fec8527
 2014-09-25 18:25:21 +02:00
Jeff Sharkey
c4997a1d9c am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
  Include reason when wiping data.
 2014-09-24 23:35:37 +00:00
Andreas Gampe
a103ebed6e resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aosp 
Change-Id: Ia9c350dcfb41f9d04400a86bd7e5f2cf2af656f1
 2014-09-24 15:38:02 -07:00
Jeff Sharkey
004a4b20f8 Include reason when wiping data. 
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
 2014-09-24 13:58:09 -07:00
Dianne Hackborn
c21c6ab3a7 am 076741d5: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 
* commit '076741d5776be95a19259827d1e1b2b196eb4ba3':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop
 2014-09-23 21:14:20 +00:00
Dianne Hackborn
d0e0154c1f Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev 2014-09-23 20:55:05 +00:00
Dianne Hackborn
25e1ecaabb Maybe fix issue #17614177 APR: system process restarting due to infinite loop 
Also try to get rid of a huge wtf we are seeing across a lot of devices
where we incorrectly change real states on a service that is restarting,
and get rid of one of the noisier boot logs in the package manager.

Change-Id: I2510b6fb082eac3f6168cbd57bc3b70ad006114d
 2014-09-23 10:33:30 -07:00
jgu21
2eacd06bfb Frameworks/base: Early init native bridge 
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
 2014-09-22 16:04:37 -07:00
Alan Viverette
05f74b9a6b am 2c65386d: am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev 
* commit '2c65386d9bb3d93f39767a284eb3dcc27dd0a2f3':
  Pass explicit null theme when preloading drawables
 2014-09-22 19:37:19 +00:00
Alan Viverette
e786895918 Merge "Pass explicit null theme when preloading drawables" into lmp-dev 2014-09-22 19:18:03 +00:00
Yohei Yukawa
a8f3d15be2 am dc5fad8e: am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 
* commit 'dc5fad8e086a50f5e438ea8fc5bfd692e4bd76f9':
  Work on issue #17506095: Plumb a new configuration to IMMS
 2014-09-22 18:23:26 +00:00
Yohei Yukawa
ca5e72c5ae Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev 2014-09-22 18:02:12 +00:00
Alan Viverette
84e001a9f5 Pass explicit null theme when preloading drawables 
Prevents "unresolved theme attributes" warning.

BUG: 17589490
Change-Id: I5217d85b1d5ce8b551315ee8b1ca79eccfac3f10
 2014-09-22 07:05:33 +00:00
Yigit Boyar
2c029f3fe2 am 747a975b: am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev 
* commit '747a975bef3589fb5407ad3f74cc67770e2d86fa':
  Allow fallback to Toolbar's default Navigation Icon
 2014-09-22 02:07:54 +00:00
Yigit Boyar
5507b223dd Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev 2014-09-22 01:14:40 +00:00
Yohei Yukawa
e63b5fae8d Work on issue #17506095: Plumb a new configuration to IMMS 
This CL makes a plumbing from SystemConfig to IMMS.

Change-Id: Ia70b870723acf647e0c27f24aff91b40d6f85543
 2014-09-21 10:34:35 +09:00
Yigit Boyar
30f5dc935b Allow fallback to Toolbar's default Navigation Icon 
Bug: 17554486
Change-Id: Id9f2197820df42d81351540be5baa852f49bdf0a
 2014-09-19 18:26:07 -07:00
Alan Viverette
68247b0303 am f680e5f2: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit 'f680e5f2820111f464f4100bb771bae0cca75518':
  Correctly apply max width/height to preference icons
 2014-09-19 22:42:02 +00:00
Alan Viverette
ecd7c96aa4 Correctly apply max width/height to preference icons 
BUG: 17581750
Change-Id: I8ad21a321c80f0a657670ba4d175d0ebecea49ef
 2014-09-19 13:36:29 -07:00
Alan Viverette
194206c4d7 am c5073a81: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit 'c5073a812a82928ae681c9fcd328a3b1323b4edc':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 20:57:26 +00:00
Alan Viverette
07ecc748fb Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 2014-09-18 20:25:22 +00:00
Sander Alewijnse
549715d5fa am a735243f: am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev 
* commit 'a735243fba6ca4c0de7877831230d8c209882748':
  Update targetSdkVersion check.
 2014-09-18 12:00:22 +00:00
Sander Alewijnse
d4710c87e6 Merge "Update targetSdkVersion check." into lmp-dev 2014-09-18 11:36:19 +00:00
Alan Viverette
a9ddb8dc23 Use action bar theme for action modes, fix ViewStub inflation theme 
BUG: 17262483
BUG: 17513621
Change-Id: I74764570a11da162a224e94978e21e52d17e2e84
 2014-09-17 18:14:32 -07:00
Yigit Boyar
8424665e0e am 777f6c3c: am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 
* commit '777f6c3c846a4a6722664cf119f6b8959b9db6f0':
  Handle action mode changes properly for actionbar tabs
 2014-09-17 21:22:02 +00:00
Yigit Boyar
fd20f196b1 Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev 2014-09-17 21:00:40 +00:00
Sandeep Siddhartha
67032ce76a am 9364b830: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev 
* commit '9364b830a4d78a3c76cc7eacc71c9b7808fd414b':
  Fix issues with multiple languages and multi-users
 2014-09-17 20:33:17 +00:00
Sandeep Siddhartha
80ea66b102 Merge "Fix issues with multiple languages and multi-users" into lmp-dev 2014-09-17 20:06:43 +00:00
Yigit Boyar
2bbad0cddc Handle action mode changes properly for actionbar tabs 
Bug: 17513613
Change-Id: I4ebcadc618558153b72bf577232adc3e616adb6b
 2014-09-16 18:28:03 -07:00
Adam Lesinski
2958c016a1 am 3b36b8c7: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit '3b36b8c7d91dc8793429491617c645c1aafc4d49':
  Show the lockscreen when more than 1 user is present
 2014-09-16 08:59:29 +00:00
Yohei Yukawa
abe0c395f9 am 5a2efd42: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit '5a2efd42d8d0b1c52f628b8e727d3c99b068ae96':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 08:59:08 +00:00
Adam Powell
7276265f31 am 9965e970: am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit '9965e9708b5dc64bc9e591f72ff6eaf6c3968d0f':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 08:58:58 +00:00
Adam Powell
5ba05c4fb5 am acec24c1: am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit 'acec24c1487e32264ee395121db2e607259dd7ca':
  Finish materializing dialogs
 2014-09-16 08:58:48 +00:00
Sandeep Siddhartha
8cf8f71644 Fix issues with multiple languages and multi-users 
For multi-user the issue was looking into the user ID of the current
process instead of the active user. The current process was the system
process and the call to UserManager was returning a user handle that
wasn't of any use while trying to map sound models to a user.

For language, the issue was that we were incorrectly just looking up the
model based on the keyphrase id, however we should have also taken the
enrolled model's locale into account.

Explicitly document that for model management the string representation of locales
is a BCP47 language tag.

Remove debug logging.

Bug: 16798166
Bug: 17462570
Bug: 17463511
Change-Id: Ieffb3e218de63f6e7f40af9705dced481a35b0ad
 2014-09-15 19:59:09 -07:00
Adam Lesinski
3846c1d261 Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 2014-09-16 00:50:23 +00:00