Craig Mautner
20e7227454
Remove mFocusedStack from ActivityManagerService.
...
Use ActivityStackSupervisor.mMainStack in its place. Or, in cases
where multiple stacks must replace mFocusedStack, create new
methods in ActivityStackSupervisor that will replace it.
Change-Id: Ib0dda51e1043a6d5110e5a2914d695ef16bf9371
2013-04-01 13:57:18 -07:00
Craig Mautner
e11f2b774b
Minor refactors
...
- Eliminate unused mLooper.
- Rename isSleeping to isSleepingOrShuttingDown.
- Fix dump formats.
Change-Id: I4cfc99605ac34213bf9b705562f2c701810434fd
2013-04-01 13:06:11 -07:00
Craig Mautner
5496140428
Merge "Move mStacks to ActivityStackSupervisor"
2013-04-01 16:11:05 +00:00
Amith Yamasani
18c8558a4b
am 30cfaf7c: am 63fba8c1: Merge "Add new primary accounts to secondary limited users" into jb-mr2-dev
...
* commit '30cfaf7c863cf33dbfa6c7f9681997735fe62d40':
Add new primary accounts to secondary limited users
2013-03-31 17:55:27 -07:00
Amith Yamasani
5be347bc52
Add new primary accounts to secondary limited users
...
When a new account is added to the primary, those will be marked
as shared accounts for secondary limited users. If the secondary user
is currently running, clone the account right away.
Bug: 8510431
Change-Id: Ie8ad87a7205e7b1a5a1752e75fbbfc416b2a58a7
2013-03-31 17:44:31 -07:00
Amith Yamasani
bb49e8573e
resolved conflicts for merge of 15935aad to master
...
Change-Id: I9664186a62cf7b11844c6a14967f5b8c2b67c289
2013-03-30 19:26:37 -07:00
Amith Yamasani
42bc734b30
Merge "Block access to accounts for limited users." into jb-mr2-dev
2013-03-31 01:32:39 +00:00
Amith Yamasani
27db46850b
Block access to accounts for limited users.
...
Make sure that apps that have access to restricted accounts can see them.
If they don't have access, they shouldn't be able to add a new account either.
Show an error message in the account picker if the user/app is not authorized.
Change-Id: I117c0b14d7d06c5ac4e66506df156b174567f5f3
2013-03-30 18:25:49 -07:00
Geremy Condra
cac0e0b11b
Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev
2013-03-30 22:08:20 +00:00
Amith Yamasani
8d01846130
am 5c98b904: am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev
...
* commit '5c98b9046506cc69b261dd6ac2ae39b2de0afacb':
Improve RestrictionEntry API
2013-03-29 18:52:58 -07:00
Amith Yamasani
9e8ba8f273
Merge "Improve RestrictionEntry API" into jb-mr2-dev
2013-03-30 01:47:33 +00:00
Amith Yamasani
86118baa4f
Improve RestrictionEntry API
...
More getters and setters, better naming.
New extra defined for returning a custom intent that handles showing the
restrictions UI.
Change-Id: I2ee0cdb4edd99e71a9004ff5e929dbe243b45557
2013-03-29 17:28:47 -07:00
Geremy Condra
77118fb55e
Add SELinux updater and Settings-based enforcement switch.
...
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
2013-03-29 16:52:56 -07:00
Geremy Condra
4e7f7e839e
Add SELinux updater and Settings-based enforcement switch.
...
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
2013-03-29 15:48:15 -07:00
Jatin Lodhia
278700fdb9
am 98c762bf: am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev
...
* commit '98c762bf7cd291e4ae3d9923a8feb3389855ecff':
AccountManager changes for profile seeding.
2013-03-29 14:36:14 -07:00
Jatin Lodhia
ce66fd7479
Merge "AccountManager changes for profile seeding." into jb-mr2-dev
2013-03-29 20:44:49 +00:00
Lorenzo Colitti
4d25dd94aa
am 742056ee: am 2fb669e6: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev
...
* commit '742056ee37e94cd51390527fea835112b29c8a94':
Stop clat if it's no longer in use.
2013-03-28 18:25:52 -07:00
Lorenzo Colitti
2fb669e68f
Merge "Stop clat if it's no longer in use." into jb-mr2-dev
2013-03-29 01:17:45 +00:00
Geremy Condra
3868a19759
am a54e0643: am 9d034deb: am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list."
...
* commit 'a54e064365706d40c55c2984cca1f15a6bf3e8fb':
Save off the seinfo value with packages.list.
2013-03-28 16:58:51 -07:00
Geremy Condra
9d034debdd
am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list."
...
* commit '24948d3ca7ff7fa70ee85e9aa7530239d7b482b2':
Save off the seinfo value with packages.list.
2013-03-28 16:55:03 -07:00
Matthew Xie
3f9560261f
am e4eb23ec: am 84e594f7: Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev
...
* commit 'e4eb23ecc232c508974976844df2ea8c44025fe9':
Unhide Bluetooth Low Energy public APIs
2013-03-28 16:10:03 -07:00
Matthew Xie
84e594f7db
Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-dev
2013-03-28 23:04:48 +00:00
Matthew Xie
ddf7e4756c
Unhide Bluetooth Low Energy public APIs
...
Updated API headers. Add BluetoothManager to be retrieved by
context.getSystemService(Context.BLUETOOTH_SERVICE).
LE scan functions are placed in BluetoothAdapter
The GATT API are device driven instead of a profile-driver.
bug 8450158
Change-Id: I424a4cedaac3ef8120a05996500008dd210d2553
2013-03-28 15:36:10 -07:00
Geremy Condra
946a5c91d9
Merge "Save off the seinfo value with packages.list."
2013-03-28 21:45:22 +00:00
Elliott Hughes
d1e0f941d5
am 0f3a3777: am 94eaab4a: am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]"
...
* commit '0f3a3777026c20011f1b419daf12980715e594ff':
Correct executable bit for source files [Take 2]
2013-03-28 14:32:59 -07:00
Geremy Condra
565dd2c469
am 0314b976: am 5c3bd37a: am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels."
...
* commit '0314b976654ac9f64f8bb60962b81feadcc13d20':
Add data validation on seinfo labels.
2013-03-28 14:32:56 -07:00
Elliott Hughes
94eaab4a5d
am 3ae30483: am a19647d3: Merge "Correct executable bit for source files [Take 2]"
...
* commit '3ae30483777708ff3a4f59a4fa75c6a76213cc30':
Correct executable bit for source files [Take 2]
2013-03-28 14:29:21 -07:00
Geremy Condra
5c3bd37ab7
am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels."
...
* commit 'f21a34bf1b188cd662f6a08f5c709f4f641b1494':
Add data validation on seinfo labels.
2013-03-28 14:29:17 -07:00
Elliott Hughes
a19647d3d8
Merge "Correct executable bit for source files [Take 2]"
2013-03-28 20:50:34 +00:00
Jatin Lodhia
3df7d697ca
AccountManager changes for profile seeding.
...
Add a new error code to AccountManager and remove the check for
limited user during add account to allow Authenticators to seed
account during limited profile startup.
Change-Id: I5a73def9fc3baeb8e6de1b42e923829c335e1668
2013-03-28 13:46:58 -07:00
Amith Yamasani
b54a93adaf
am 1438d67e: am e494a81f: Merge "Restricted account visibility" into jb-mr2-dev
...
* commit '1438d67e7ddaba1133f181bc70cd706acf57a520':
Restricted account visibility
2013-03-28 13:36:52 -07:00
Amith Yamasani
e494a81f9b
Merge "Restricted account visibility" into jb-mr2-dev
2013-03-28 20:31:44 +00:00
Geremy Condra
318a767e0d
Merge "Remove keysets from PackageKeySetData when KeySetManager removes them."
2013-03-28 20:15:53 +00:00
Ben Cheng
1e2cd5b84c
am 6a1033e3: am 3eba5ad1: Merge "Crank up the mOomMinFreeHigh values by 50%." into jb-mr2-dev
...
* commit '6a1033e3e0972caaf10e1efb00b240238959a3c9':
Crank up the mOomMinFreeHigh values by 50%.
2013-03-28 13:06:06 -07:00
Ben Cheng
3eba5ad1e2
Merge "Crank up the mOomMinFreeHigh values by 50%." into jb-mr2-dev
2013-03-28 19:59:55 +00:00
Maggie Benthall
c78453f12b
am b3c060a1: am c92342bb: Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev
...
* commit 'b3c060a166e9d5a141a6500e4c443a20d4e002b6':
Add user restrictions for bluetooth, sideloading, usb file transfer
2013-03-28 12:20:05 -07:00
Maggie Benthall
c92342bb01
Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev
2013-03-28 19:15:46 +00:00
Jeff Brown
f2e0ed61a6
am 0c454a0a: am 1263deb9: Merge "Allow system server to bind to USB devices." into jb-mr2-dev
...
* commit '0c454a0a7a45047c3aba3e7928f84e1622d2be96':
Allow system server to bind to USB devices.
2013-03-28 11:59:44 -07:00
Jeff Brown
1263deb936
Merge "Allow system server to bind to USB devices." into jb-mr2-dev
2013-03-28 18:55:10 +00:00
Craig Mautner
8d341efad0
Move mStacks to ActivityStackSupervisor
...
Lift all ActivityStack behaviors from ActivityManagerService.
Change-Id: I356f1c22fe31f0442ff5e363f62fe99b7bfd6153
2013-03-28 11:30:01 -07:00
Robert Greenwalt
62a2cb0902
am 766991ae: am 5acc8632: Merge "Add BT - DataTracker connection" into jb-mr2-dev
...
* commit '766991ae212f50695754c3ded5d9815fb0d99b24':
Add BT - DataTracker connection
2013-03-28 09:50:50 -07:00
Robert Greenwalt
5acc8632a7
Merge "Add BT - DataTracker connection" into jb-mr2-dev
2013-03-28 16:45:33 +00:00
Robert Craig
d417ab0ea5
Add data validation on seinfo labels.
...
Ensure that policy contains a clean seinfo
string. Where clean means no whitespace characters.
Change-Id: I814411cbc8d16eaed99a1389f5487529e36e617b
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-03-28 12:19:27 -04:00
Jeff Brown
e8eea12a24
Allow system server to bind to USB devices.
...
Change-Id: I31f9ed1ff3fcda53f62f08ae198d18d0df3321b7
2013-03-28 03:15:40 -07:00
Lorenzo Colitti
d2ef1e50c4
Stop clat if it's no longer in use.
...
Normally, clatd is stopped when a connection disconnects.
However, if the connection's LinkProperties change, or if the
disconnect somehow gets lost (e.g., because of bug 8486114),
then we need to stop it (and possibly restart it).
Bug: 8276725
Change-Id: Ib8ad0d653ed8d0cd70b7414bcaa8fdaef8ba5fcc
2013-03-28 14:45:36 +09:00
Amith Yamasani
0ac1fc9d23
Restricted account visibility
...
When accounts are shared to a restricted/limited user, apps can
opt-in to viewing accounts of a certain type. Other shared accounts
are not visible to the app.
App would specify the account type in the manifest <application> tag
with the attribute restrictedAccountType="foo.bar", where "foo.bar"
is the account type as defined by the authenticator.
Change-Id: I7586da04d6d6d32aae15adc6b1366f325bb07384
2013-03-27 18:56:08 -07:00
Ben Cheng
b5cda42c57
Crank up the mOomMinFreeHigh values by 50%.
...
Devices with 1GB of RAM can benefit from more aggressive OOM killer.
BUG: 7972252
Change-Id: Id2b80c14a3cff195c17ef0d14c80b92394649d98
2013-03-27 17:36:13 -07:00
Dianne Hackborn
d734b4f285
am 6b8e7b35: am bf20aa76: Merge "Keep track of who has disabled applications." into jb-mr2-dev
...
* commit '6b8e7b35ef763d29a30c87a5a95ef941d39a8ee9':
Keep track of who has disabled applications.
2013-03-27 16:40:49 -07:00
Dianne Hackborn
bf20aa767e
Merge "Keep track of who has disabled applications." into jb-mr2-dev
2013-03-27 23:32:36 +00:00
Robert Greenwalt
665e1aed5e
Add BT - DataTracker connection
...
Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.
bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
2013-03-27 15:45:12 -07:00