Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
166,917 Commits 3 Branches 0 Tags
ab7b08a50037cd416c61395dfb2ea87593ec2572
Commit Graph

2053 Commits

Author SHA1 Message Date
Dianne Hackborn
d95f1c991c am 75a6e82b: am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '75a6e82bcc625025c5f48dc6c33d0dd469e9ca61':
  Put in real "code" (aka marketing) name.
 2014-10-10 05:41:19 +00:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Dianne Hackborn
89b196958f Merge "Put in real "code" (aka marketing) name." into lmp-dev 2014-10-08 17:59:19 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Amith Yamasani
a7081321d8 am 34a2a6ca: am 42f611f2: am 4797554a: am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '34a2a6ca933c3583fda5a04bf26f9951aa139e79':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 18:07:52 +00:00
Amith Yamasani
34a2a6ca93 am 42f611f2: am 4797554a: am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '42f611f2f5cbc68a6aaac18ed9e3c62ebc765901':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 18:02:29 +00:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms 
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
 2014-10-06 18:24:32 -07:00
John Spurlock
0816ecd0af am 29ab5f7d: am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '29ab5f7dc0e9ba2ef3db2993d9ac5f9a48e9df12':
  Fix NPE in StrictMode handling.
 2014-10-06 19:43:49 +00:00
John Spurlock
29ab5f7dc0 am 42730c93: am b6f5cb3e: am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '42730c93466d2ff533b42f56b4dd0080aad40d59':
  Fix NPE in StrictMode handling.
 2014-10-06 19:39:41 +00:00
John Spurlock
9bb3dacbf9 Fix NPE in StrictMode handling. 
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
 2014-10-06 12:36:45 -04:00
Dianne Hackborn
c7d1467a8b am cba999c1: am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'cba999c164d206c1fb2b7f9f2bf78e8ed616c67d':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:59:09 +00:00
Dianne Hackborn
cba999c164 am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'e2776f02bf4fd58af88a27261226e9ce124aa6b8':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:52:23 +00:00
Dianne Hackborn
d867b7c7a2 Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
...'java.lang.String java.lang.String.substring(int)' on a null object reference

Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
 2014-10-03 11:43:10 -07:00
Dianne Hackborn
09f25547d9 am 4bcfcc69: am b49a19b9: am 8aa21f20: am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit '4bcfcc69416831b199fb866f56725c88cdcee03c':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 23:46:25 +00:00
Dianne Hackborn
4bcfcc6941 am b49a19b9: am 8aa21f20: am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 
* commit 'b49a19b9bd2fed00b8fbf3f5a4f9fb7c34e969a3':
  SDK only: Update docs to reflect current implementation.
 2014-10-02 23:37:54 +00:00
Dianne Hackborn
7a73f2c5aa Merge "SDK only: Update docs to reflect current implementation." into lmp-dev 2014-10-02 22:49:43 +00:00
Dianne Hackborn
67a101aa30 SDK only: Update docs to reflect current implementation. 
Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
 2014-10-02 12:44:01 -07:00
Sreeram Ramachandran
4924e5d87b am 44774ad0: am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '44774ad079e95606186ed186672449de295d6769':
  Send app permissions to netd.
 2014-10-02 13:46:58 +00:00
Dianne Hackborn
7c56fd3c25 am 7cf6cac5: am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '7cf6cac507df68ecb1d6484a5287687e4df61573':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:46:39 +00:00
Sreeram Ramachandran
44774ad079 am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '9e987f1d76e18bca72583ab5f4ff65ae4e8c381e':
  Send app permissions to netd.
 2014-10-02 13:39:05 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:38:23 +00:00
Sreeram Ramachandran
e4a05afe85 Send app permissions to netd. 
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
 2014-10-01 20:22:34 -07:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager 
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
 2014-10-01 16:58:56 -07:00
Narayan Kamath
89f3665dac am 17044459: am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '170444599ce44b3b427267a190bed79d9afb709d':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:13:28 +00:00
Narayan Kamath
170444599c am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '870c3553f15d9d085bb30b063563143c2fd09322':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:02:44 +00:00
Dianne Hackborn
42b7a45a56 am 67787a82: am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '67787a82a01460f0d68c154fdf3045bdc1ee572f':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 17:18:29 +00:00
Dianne Hackborn
67787a82a0 am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'cb5fc84b554aa82a98867f997caffea3d7067033':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 17:10:04 +00:00
Narayan Kamath
7dc7f676d6 Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 2014-10-01 09:53:34 +00:00
Dianne Hackborn
a0767b3652 am f9cd6fa5: am bb527c59: am e26ba8f7: am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'f9cd6fa5a34a9ba22eaa47d8c5f9c39b5cd901a2':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 02:14:37 +00:00
Dianne Hackborn
f9cd6fa5a3 am bb527c59: am e26ba8f7: am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'bb527c59d1fb0ad627f44cbb378959fa7d4af2c7':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 01:42:37 +00:00
Dianne Hackborn
ce92b0d070 More work on issue #17656716: Unhandled exception in Window Manager 
Drop down the limit on when we log, since under normal operation we
will never get more than a few K of data due to strict mode.

Try to clean up the code paths coming in and out of binder IPCs to
plug any places where we could disrupt the gather flag of a thread,
causing it to keep gathering stack crawls (which is the thing that
is causing our strict mode data to become so large).

Change-Id: I9a46512283d33e863c429840b465855d1fabb74e
 2014-09-30 11:28:18 -07:00
Narayan Kamath
eff258c305 Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS 
32 bit processes will always see values from SUPPORTED_32_BIT_ABIS
and 64 bit processes will always see values from SUPPORTED_64_BIT_ABIS.

bug: 17367265
Change-Id: I9996034c190f9213986b9b1a4ee0e38eca91c7ad
 2014-09-30 13:56:06 +01: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
Dianne Hackborn
c439d093ca am 09f14417: am 8776bd54: am cad60dc8: am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '09f144176e32b2f352ca8a1bee93c26403c69408':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-29 19:46:24 +00:00
Elliott Hughes
b6af870bcd am 5d8bcd28: am 737b8cd2: am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '5d8bcd285d190de924a47c39155530038799d148':
  Set the system locale correctly even on an encrypted device.
 2014-09-29 19:46:02 +00: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
Dianne Hackborn
09f144176e am 8776bd54: am cad60dc8: am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '8776bd549ed4db7c5e2e5f487d043e8d1b53ff12':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:42:02 +00:00
Elliott Hughes
5d8bcd285d am 737b8cd2: am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '737b8cd29ccc9799f8a309ca33c0ba4f4c0016d4':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 23:13:49 +00:00
Dianne Hackborn
820eab3e75 Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-26 23:11:40 +00:00
Dianne Hackborn
fad079dc5d More debugging for issue #17656716: Unhandled exception in Window Manager 
Change-Id: I81d3678e21d293d5896c467ae5c6739c82cfaa95
 2014-09-26 15:46:24 -07: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
b0e58ff6b3 am 534556ae: am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '534556aef5ae22d522c5988d535b3b19b3742fd3':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-26 15:28:28 +00:00
Dianne Hackborn
a15dcc3fa1 am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '6b9b8a03847a190e1f3c9cf50fc3989a572d7534':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-26 05:04:02 +00:00
Dianne Hackborn
017c6a28be Work on issue #17656716: Unhandled exception in Window Manager 
Create descriptive errors when sending unreasonably large
parcels through IPC.

Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
 2014-09-25 17:48:44 -07:00
Jeff Sharkey
c894355d7e am d46c9385: am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit 'd46c93852393569e3211fc7bada91e712634572e':
  Include reason when wiping data.
 2014-09-25 17:18:31 +00:00
Jeff Sharkey
52e40aaa8a am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
  Include reason when wiping data.
 2014-09-25 17:05:42 +00:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
Andreas Gampe
4d64addc20 am 43d02564: resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp 
* commit '43d0256429c46a1243c8d85a34d029b40fd5e34e':
  Frameworks/base: Early init native bridge
 2014-09-24 23:02:38 +00:00
Andreas Gampe
a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp 
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
 2014-09-24 15:47:36 -07:00